From 453e755e0a710837d3c2d5bce177f360de038ca1 Mon Sep 17 00:00:00 2001 From: dengbw Date: Fri, 24 Sep 2021 11:47:54 +0800 Subject: [PATCH] admin_orders_924_3 --- admin/controllers/receiver/Orders.php | 43 +++++++++++-------- admin/views/receiver/order/agent/lists.php | 2 +- admin/views/receiver/order/bill/lists.php | 2 +- admin/views/receiver/order/ckcar/lists.php | 2 +- admin/views/receiver/order/delivery/lists.php | 2 +- admin/views/receiver/order/sign/lists.php | 8 ++-- admin/views/receiver/orders/lists.php | 2 +- admin/views/receiver/orders/oinfo.php | 6 ++- 8 files changed, 37 insertions(+), 30 deletions(-) diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 1b27c6bd..8fd6d4a3 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -89,7 +89,7 @@ class Orders extends HD_Controller public function get() { - $status_arr = $this->order_signs_model->get_status(); + $status_arr = $this->orders_model->statusAry(0); $id = $this->input->get('id'); $row = $this->orders_model->get(['id' => $id]); @@ -104,7 +104,7 @@ class Orders extends HD_Controller $row['price'] = number_format($row['price'], 2); $row['deposit'] = number_format($row['deposit'], 2); $row['c_time'] = date('Y-m-d', $row['c_time']); - $row['sign_status_name'] = $status_arr[$sign['status']]; + $row['sign_status_name'] = $status_arr['list'][$sign['status']]; $row['cf_title'] = $customers['cf_title']; $row['payway'] = intval($row['payway']); $row['item_id'] = intval($row['item_id']); @@ -126,6 +126,8 @@ class Orders extends HD_Controller $row_goods = $this->mdItems->get(array('id' => $row['item_id'])); $row['vin'] = $row_goods['vin']; } + $row['delry_time'] = $row['delry_time'] != '0000-00-00 00:00:00' + ? str_replace(" 00:00:00", "", $row['delry_time']) : ''; //获取贷款信息 if (!$row['payway'] && $row['status'] > 0) { $auto_finance_row = $this->auto_finance_model->get(['id' => $row['finance_id']], 'fin_id,num'); @@ -143,8 +145,8 @@ class Orders extends HD_Controller //获取开票 $bill = $this->order_bills_model->get(['o_id' => $row['id']], 'status,file,cardidA,cardidB'); $bill['file'] = $bill['file'] ? build_qiniu_image_url($bill['file']) : ''; - $bill['cardidA'] = $bill['cardidA'] ? array('value' => $bill['cardidA'], 'src' => build_qiniu_image_url($bill['cardidA'])) : array('value' => '', 'src' =>''); - $bill['cardidB'] = $bill['cardidB'] ? array('value' => $bill['cardidB'], 'src' => build_qiniu_image_url($bill['cardidB']) ) : array('value' => '', 'src' => ''); + $bill['cardidA'] = $bill['cardidA'] ? array('value' => $bill['cardidA'], 'src' => build_qiniu_image_url($bill['cardidA'])) : array('value' => '', 'src' => ''); + $bill['cardidB'] = $bill['cardidB'] ? array('value' => $bill['cardidB'], 'src' => build_qiniu_image_url($bill['cardidB'])) : array('value' => '', 'src' => ''); $bill['status'] = intval($bill['status']); $row['bill'] = $bill; //获取合同文件 @@ -229,25 +231,26 @@ class Orders extends HD_Controller * 更新身份证信息 * @return bool */ - function edit_cardID(){ + function edit_cardID() + { $o_id = $this->input->post('o_id'); $cardidA = $this->input->post('cardidA'); $cardidB = $this->input->post('cardidB'); - if(!$cardidA || !$cardidB){ - return $this->show_json(SYS_CODE_FAIL,'请上传身份证照片'); + if (!$cardidA || !$cardidB) { + return $this->show_json(SYS_CODE_FAIL, '请上传身份证照片'); } $this->load->library('TcOrc'); $cardidA_src = build_qiniu_image_url($cardidA); $result = $this->tcorc->IdentityCard($cardidA_src); - if(!$result['code']){ - return $this->show_json(SYS_CODE_FAIL,'身份证校验不通过'); + if (!$result['code']) { + return $this->show_json(SYS_CODE_FAIL, '身份证校验不通过'); } else { //校验姓名 $uname = $result['data']['Name']; - $row_order = $this->orders_model->get(['id'=>$o_id]); - if($uname != $row_order['name']){ - return $this->show_json(SYS_CODE_FAIL,'身份证姓名与客户不一致'); + $row_order = $this->orders_model->get(['id' => $o_id]); + if ($uname != $row_order['name']) { + return $this->show_json(SYS_CODE_FAIL, '身份证姓名与客户不一致'); } } @@ -255,11 +258,11 @@ class Orders extends HD_Controller 'cardidA' => $cardidA, 'cardidB' => $cardidB ); - $result = $this->order_bills_model->update($upd,['o_id'=>$o_id]); - if($result){ - return $this->show_json(SYS_CODE_SUCCESS,'保存成功'); - }else{ - return $this->show_json(SYS_CODE_FAIL,'保存失败'); + $result = $this->order_bills_model->update($upd, ['o_id' => $o_id]); + if ($result) { + return $this->show_json(SYS_CODE_SUCCESS, '保存成功'); + } else { + return $this->show_json(SYS_CODE_FAIL, '保存失败'); } } @@ -359,7 +362,7 @@ class Orders extends HD_Controller $ckcar && $replace['id'] = $ckcar['id']; $this->order_ckcars_model->replace($replace); } - $this->data['params']= $params; + $this->data['params'] = $params; return $result ? $this->show_json(SYS_CODE_SUCCESS, '保存成功') : $this->show_json(SYS_CODE_FAIL, '保存失败'); } @@ -424,8 +427,10 @@ class Orders extends HD_Controller $this->data['bill'] = $bill; return $this->show_view('receiver/orders/get_bill'); } + //编辑发票信息 - public function edit_bill(){ + public function edit_bill() + { $id = $this->input->post('id'); $money = $this->input->post('money'); $file = $this->input->post('file'); diff --git a/admin/views/receiver/order/agent/lists.php b/admin/views/receiver/order/agent/lists.php index 38561029..b9b38567 100644 --- a/admin/views/receiver/order/agent/lists.php +++ b/admin/views/receiver/order/agent/lists.php @@ -177,7 +177,7 @@ 客户姓名 客户电话 - 车辆 + 车辆 车辆平台价 定金 付款方式 diff --git a/admin/views/receiver/order/bill/lists.php b/admin/views/receiver/order/bill/lists.php index 51e13403..c28749bd 100644 --- a/admin/views/receiver/order/bill/lists.php +++ b/admin/views/receiver/order/bill/lists.php @@ -177,7 +177,7 @@ 客户姓名 客户电话 - 车辆 + 车辆 车辆平台价 定金 付款方式 diff --git a/admin/views/receiver/order/ckcar/lists.php b/admin/views/receiver/order/ckcar/lists.php index 9dc20e56..560fe9aa 100644 --- a/admin/views/receiver/order/ckcar/lists.php +++ b/admin/views/receiver/order/ckcar/lists.php @@ -190,7 +190,7 @@ 客户姓名 客户电话 - 车辆 + 车辆 车辆平台价 定金 付款方式 diff --git a/admin/views/receiver/order/delivery/lists.php b/admin/views/receiver/order/delivery/lists.php index 21a626ed..353a811a 100644 --- a/admin/views/receiver/order/delivery/lists.php +++ b/admin/views/receiver/order/delivery/lists.php @@ -190,7 +190,7 @@ 客户姓名 客户电话 - 车辆 + 车辆 车辆平台价 定金 付款方式 diff --git a/admin/views/receiver/order/sign/lists.php b/admin/views/receiver/order/sign/lists.php index 268d0862..b0db1555 100644 --- a/admin/views/receiver/order/sign/lists.php +++ b/admin/views/receiver/order/sign/lists.php @@ -188,14 +188,14 @@ - + - + - - + + diff --git a/admin/views/receiver/orders/lists.php b/admin/views/receiver/orders/lists.php index 04014e4a..bde431d6 100644 --- a/admin/views/receiver/orders/lists.php +++ b/admin/views/receiver/orders/lists.php @@ -169,7 +169,7 @@ - + diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php index 3ab21286..bf0cfeb9 100644 --- a/admin/views/receiver/orders/oinfo.php +++ b/admin/views/receiver/orders/oinfo.php @@ -78,8 +78,10 @@
- -
 
+ +
+ +
客户姓名客户姓名 客户电话车辆车辆 合同价 定金 付款合同状态销售员合同状态销售员 订单时间 操作
客户姓名 客户电话车辆车辆 车辆平台价 定金 付款方式