From e60e1f9423ae1d0b6b906334567a9467e136f638 Mon Sep 17 00:00:00 2001 From: qianhy Date: Tue, 7 Feb 2023 11:18:15 +0800 Subject: [PATCH] inve add city about --- admin/controllers/items/Inventory.php | 52 ++++++++- admin/views/items/inventory/lists.php | 124 +++++++++++++++++++++- admin/views/items/inventory/lists_log.php | 21 +++- 3 files changed, 189 insertions(+), 8 deletions(-) diff --git a/admin/controllers/items/Inventory.php b/admin/controllers/items/Inventory.php index 9ad2e044..60385848 100644 --- a/admin/controllers/items/Inventory.php +++ b/admin/controllers/items/Inventory.php @@ -46,7 +46,9 @@ class Inventory extends HD_Controller foreach ($res as $key => $value) { $setValue = []; $setValue['id'] = $value['id']; - $setValue['title'] = '盘点时间_' . date('Y-m-d', $value['c_time']); + $jsondata = $value['jsondata'] ? json_decode($value['jsondata'], true) : array(); + $city_name = $jsondata['city_name'] ? '_'.$jsondata['city_name'] : ''; + $setValue['title'] = '盘点时间_' . date('Y-m-d', $value['c_time']).$city_name; $lists[] = $setValue; } } @@ -190,6 +192,7 @@ class Inventory extends HD_Controller $map_addr[$v['id']] = "{$v['city_name']} {$v['county_name']} 其它 {$v['title']}"; } } + $row_id = 0; foreach ($res as $key => $v) { $address = $mileage = $itemStatus_name = $car_img = $where_logs = ''; if ($v['biz_id'] > 0) { @@ -217,20 +220,38 @@ class Inventory extends HD_Controller } $jsondata = $v['jsondata'] ? json_decode($v['jsondata'], true) : []; $jsondata['mileage'] && $mileage = $jsondata['mileage']; - if ($jsondata['car_img']) { + /*if ($jsondata['car_img']) { foreach ($carImgAry as $key2 => $value2) { $src = $jsondata['car_img'][$key2]; $src && $car_img[] = ['title' => $value2, 'src' => build_qiniu_image_url($src)]; } + }*/ + $car_img_layer = $car_img = array(); + if ($jsondata['car_img']) { + $car_img_layer['title'] = ''; + $car_img_layer['id'] = $v['item_id']; + $car_img_layer['start'] = 0; + $data = array(); + $pid = 0; + foreach ($carImgAry as $key2 => $value2) { + $src = $jsondata['car_img'][$key2]; + $src && $src = build_qiniu_image_url($src); + $src && $data[] = ['alert' => $value2, 'pid' => $pid, 'src' => $src, 'thumb' => $src]; + $src && $car_img[] = ['title' => $value2, 'pid' => $pid, 'src' => $src]; + $src && $pid += 1; + } + $data && $car_img_layer['data'] = $data; } + $in_time = $v['in_time']; if ($where_logs) { $re_logs = $this->mdItemsOplogs->max('com_time', $where_logs); $re_logs['com_time'] && $in_time = $re_logs['com_time']; } - $lists[] = ['item_id' => $v['item_id'], 'title' => $title, 'vin' => $v['vin'], 'address' => $address, - 'itemStatus_name' => $itemStatus_name, 'status_name' => $statusAry[$v['status']], 'mileage' => $mileage, 'car_img' => $car_img, + $lists[] = ['row_id' => $row_id, 'item_id' => $v['item_id'], 'title' => $title, 'vin' => $v['vin'], 'address' => $address, + 'itemStatus_name' => $itemStatus_name, 'status_name' => $statusAry[$v['status']], 'mileage' => $mileage, 'car_img' => $car_img, 'car_img_layer'=>$car_img_layer, 'in_time' => '0000-00-00 00:00:00' == $in_time ? '' : substr($in_time, 0, 10)]; + $row_id += 1; } } $this->data['pager'] = array('count' => ceil($total / $params['size']), 'curr' => $params['page'], 'totle' => $total); @@ -248,12 +269,33 @@ class Inventory extends HD_Controller public function add() { + $params = $this->input->post(); + $city_id = $params['city_id'] ? intval($params['city_id']) : 0; + $force = $params['force'] ? intval($params['force']) : 0; + # 如果当前(该月)有相同的盘点任务,再弹窗确认是否继续发起 + $starttime = mktime(0,0,0, date('m'),1, date('Y')); + $endtime = mktime(23,59,59, date('m'),date('t'), date('Y')); + $where = array('city_id' => $city_id, "c_time >= {$starttime}" => null, "c_time <= {$endtime}" => null); + $res = $this->mdInventory->count($where); + if (!$force && $res){ + return $this->show_json(-1, '本月已有此盘点,确认要重新发起吗?'); + } $c_time = time(); - $inve_id = $this->mdInventory->add(['c_time' => $c_time]); + #$inve_id = $this->mdInventory->add(['c_time' => $c_time]); + $jsondata = json_encode(array('city_name'=> $params['city_id'] && $params['city_name'] ? $params['city_name'] : '')); + $inve_id = $this->mdInventory->add(['c_time' => $c_time, 'city_id' => $city_id, 'jsondata' => $jsondata]); if (!$inve_id) { return $this->show_json(SYS_CODE_FAIL, '发起盘点失败'); } $where = array('status>' => 0, 'bill_time' => '0000-00-00 00:00:00'); + if ($city_id){ + $where_biz['city_id'] = $params['city_id']; + $res_biz = $this->mdBiz->select($where_biz, 'id desc', 0, 0, 'id'); + $res_addr = $this->addr_model->select($where_biz, 'id desc', 0, 0, 'id'); + $str_ids = $res_biz ? implode(',', array_column($res_biz, 'id')) : '-2'; + $str_addr_ids = $res_addr ? implode(',', array_column($res_addr, 'id')) : '-2'; + $where["(biz_id in ({$str_ids}) or addr_id in ({$str_addr_ids}))"] = null; + } $res = $this->mdItems->select($where, 'id asc', 0, 0, 'id,biz_id,addr_id'); $addDate = []; foreach ($res as $key => $value) { diff --git a/admin/views/items/inventory/lists.php b/admin/views/items/inventory/lists.php index ff862ff4..d23bb21d 100644 --- a/admin/views/items/inventory/lists.php +++ b/admin/views/items/inventory/lists.php @@ -24,9 +24,10 @@
+
@@ -63,6 +64,24 @@ + diff --git a/admin/views/items/inventory/lists_log.php b/admin/views/items/inventory/lists_log.php index 910acf89..2efbd27c 100644 --- a/admin/views/items/inventory/lists_log.php +++ b/admin/views/items/inventory/lists_log.php @@ -158,8 +158,8 @@ $v2) { ?> - + @@ -186,6 +186,7 @@ el: '.coms-table-wrap', data: { params: {}, + lists: {}, cityAry: [],//城市 countyAry: [],//行政区 bizAry: [],//门店 @@ -194,6 +195,7 @@ }, mounted: function () { var vm = this; + vm.lists = ; vm.params = ; vm.set_sery(); vm.init_citys(); @@ -260,6 +262,21 @@ $('#bd-auto2-id').val(0); $('#bd-auto3-id').val(0); $('#bd-auto4-id').val(''); + }, + show_car_img: function (row_id, pid) { + // alert(row_id + ' - '+ pid); + var vm = this; + let car_img_layer = vm.lists[row_id]['car_img_layer']; + // alert(car_img_layer['id']); + // console.dir(car_img_layer['start']); # 该值在辅值前后输出是不一样的 + // console.dir(car_img_layer); # 该值在辅值前后输出不一样的 + car_img_layer['start'] = pid; + // console.dir(car_img_layer['start']); + // console.dir(car_img_layer); + layer.photos({ + photos: car_img_layer, + anim: 5 // 0-6的选择,指定弹出图片动画类型,默认随机 + }); } }, watch: {