diff --git a/admin/controllers/receiver/Owners.php b/admin/controllers/receiver/Owners.php index 118b7d41..5fa9e703 100644 --- a/admin/controllers/receiver/Owners.php +++ b/admin/controllers/receiver/Owners.php @@ -10,7 +10,6 @@ class Owners extends HD_Controller { private $searchTpAry = array('mobile' => '车主电话', 'name' => '车主姓名', 'car_num' => '车牌号'); private $searchTimeAry = array('c_time' => '创建时间', 'order_time' => '购车时间', 'ck_time' => '交付时间', 'u_time' => '最后操作时间'); - protected $log_dir; public function __construct() { @@ -20,7 +19,6 @@ class Owners extends HD_Controller $this->load->model('receiver/receiver_owners_tag_model', 'mdOwnersTag'); $this->load->model('receiver/receiver_owners_tagdata_model', 'mdOwnersTagdata'); $this->load->model('receiver/receiver_xz_model'); - $this->log_dir = 'receiver_' . get_class($this); } public function index() @@ -33,7 +31,11 @@ class Owners extends HD_Controller $params = $this->input->get(); $page = $params['page'] = $params['page'] ? intval($params['page']) : 1; $size = $params['size'] = $params['size'] ? intval($params['size']) : 20; - $where = array('status>=0' => null); + if (strlen($params['status'])) { + $where["status"] = $params['status']; + } else { + $where["status>=0"] = null; + } if ($params['title']) { $where["{$params['search_tp']} like '%{$params['title']}%'"] = null; } @@ -96,6 +98,7 @@ class Owners extends HD_Controller $count = $this->mdOwners->count($where); $lists = []; $wxqyAry = $this->mdOwners->wxqyAry(); + $statusAry = $this->mdOwners->statusAry(); if ($count) { $this->load->model('auto/auto_brand_model', 'mdBrand'); $this->load->model('auto/auto_series_model', 'mdSeries'); @@ -143,11 +146,13 @@ class Owners extends HD_Controller 'order_time' => $val['order_time'] != '0000-00-00 00:00:00' ? $val['order_time'] : '', 'ck_time' => $val['ck_time'] != '0000-00-00 00:00:00' ? $val['ck_time'] : '', 'u_time' => $val['u_time'], + 'status_name' => $statusAry[$val['status']], ); } } $show_info['searchTpAry'] = $this->searchTpAry; $show_info['wxqyAry'] = $wxqyAry; + $show_info['statusAry'] = $statusAry; $this->data['show_info'] = $show_info; $this->data['lists'] = $lists; $this->data['pager'] = array('count' => ceil($count / $size), 'curr' => $page, 'totle' => $count); @@ -172,6 +177,7 @@ class Owners extends HD_Controller } $info = $row; $info['mobile'] = $mobile_sub; + $info['edit_type'] = 0; $info['order_time'] = $row['order_time'] != '0000-00-00 00:00:00' ? $row['order_time'] : ''; $info['ck_time'] = $row['ck_time'] != '0000-00-00 00:00:00' ? $row['ck_time'] : ''; $info['c_time'] = date('Y-m-d H:i:s', $row['c_time']); @@ -211,6 +217,7 @@ class Owners extends HD_Controller } } $show_info['wxqyAry'] = $this->mdOwners->wxqyAry(); + $show_info['statusAry'] = $this->mdOwners->statusAry(); $this->data['show_info'] = $show_info; $this->data['info'] = $info; $this->data['logs'] = $logs; @@ -268,8 +275,24 @@ class Owners extends HD_Controller } $msg = '修改成功'; $code = SYS_CODE_SUCCESS; - if ($info['editType'] == 1) { - } else if ($info['editType'] == 2) { + if ($info['edit_type'] == 1) {//更新状态 + if ($row['status'] == $info['status']) { + return $this->show_json(SYS_CODE_FAIL, '未修改状态！'); + } + $statuAry = $this->mdOwners->statusAry(); + $status_name = $statuAry[$row['status']]; + $status_name_up = $statuAry[$info['status']]; + $log = '更新状态(' . $status_name . ')为(' . $status_name_up . ')'; + $up_data['status'] = $info['status']; + $ret = $this->mdOwners->update($up_data, array('id' => $info['id'])); + if (!$ret) { + $code = SYS_CODE_FAIL; + $msg = '修改状态失败'; + } else { + $msg = '修改状态成功'; + $this->addLog(array('own_id' => $info['id'], 'type' => 0, 'log' => $log)); + } + } else if ($info['edit_type'] == 2) { //更新车主信息 $ret = $this->mdOwners->update(['name' => $info['name'], 'birth_day' => $info['birth_day'], 'sex' => $info['sex'], 'brand_id' => $info['brand_id'], 's_id' => $info['s_id'], 'v_id' => $info['v_id'], 'car_num' => $info['car_num'], @@ -282,7 +305,7 @@ class Owners extends HD_Controller $msg = '修改车主信息成功'; $this->addLog(array('own_id' => $info['id'], 'type' => 0, 'log' => '更新车主信息')); } - } else if ($info['editType'] == 3) { + } else if ($info['edit_type'] == 3) { $id = $info['id']; //客户标签 if (!$info['tag']) { diff --git a/admin/views/receiver/owners/get.php b/admin/views/receiver/owners/get.php index 2910c60d..374c7791 100644 --- a/admin/views/receiver/owners/get.php +++ b/admin/views/receiver/owners/get.php @@ -1,5 +1,37 @@
+
+
+
+
+
+ 状态 +
+
+ +
+
+
+
+
+
+ 取消编辑 + 编辑状态 +
+
+ 修改状态 +
+
+
+
+
@@ -149,7 +181,7 @@
-
+
- +
@@ -315,7 +347,6 @@ vue_obj = new Vue({ el: '#vue-edit', data: { - edit_index: 0, info: {}, show_info: {}, logs: [], @@ -375,10 +406,20 @@ }, editType: function (index) { var vm = this; - if (vm.edit_index == index) { - vm.edit_index = 0; + if (index == 1) { + if (vm.info.edit_type == 1) { + $("#status").attr("disabled", "disabled"); + vm.info.edit_type = 0; + } else { + $("#status").removeAttr("disabled"); + vm.info.edit_type = 1; + } } else { - vm.edit_index = index; + if (vm.info.edit_type == index) { + vm.info.edit_type = 0; + } else { + vm.info.edit_type = index; + } } }, logModal: function () { @@ -424,7 +465,6 @@ }, saveEdit: function () { var vm = this; - vm.info.editType = vm.edit_index; $.ajax({ url: '/receiver/owners/edit', type: 'post', diff --git a/admin/views/receiver/owners/lists.php b/admin/views/receiver/owners/lists.php index 68be57da..3cee9f8c 100644 --- a/admin/views/receiver/owners/lists.php +++ b/admin/views/receiver/owners/lists.php @@ -1,4 +1,19 @@ +
+ +