From 5c16df603f93f24924bf110144fce1e8d9b9a93a Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Wed, 17 Nov 2021 16:33:51 +0800
Subject: [PATCH] channel_1117_4

---
 admin/controllers/biz/store/Store.php | 19 ++++++++++++++++---
 admin/views/biz/store/lists.php       | 14 ++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/admin/controllers/biz/store/Store.php b/admin/controllers/biz/store/Store.php
index a5bfaf9f..778f0ab5 100755
--- a/admin/controllers/biz/store/Store.php
+++ b/admin/controllers/biz/store/Store.php
@@ -118,7 +118,20 @@ class Store extends HD_Controller
                 $data[] = array('name' => $value['brand_name'], 'id' => $value['id']);
             }
         }
-        $this->data['qdjl_lists'] = $this->mdLichebUsers->select(array('group_id' => 4, 'status' => 1, 'biz_id<>' => '0'), 'id desc', 0, 0, 'id,uname as name');
+        $qdjl_lists = [];
+        $res_u = $this->mdLichebUsers->select(array('group_id' => 4, 'status' => 1, 'biz_id<>' => '0'), 'id desc', 0, 0, 'id,uname as name,city_id');
+        if ($res_u) {
+            $this->load->model("sys/sys_city_model", 'mdSysCity');
+            foreach ($res_u as $value) {
+                $city_name = $name = $value['name'];
+                if ($value['city_id']) {
+                    $re_c = $this->mdSysCity->get(['city_id' => $value['city_id']]);
+                    $re_c && $city_name .= "({$re_c['name']})";
+                }
+                $qdjl_lists[] = array('id' => $value['id'], 'name' => $name, 'city_name' => $city_name);
+            }
+        }
+        $this->data['qdjl_lists'] = $qdjl_lists;
         $this->data['params'] = $params;
         $this->data['brand_list'] = $data;
         $this->data['companyAry'] = $map_company;
@@ -869,8 +882,8 @@ class Store extends HD_Controller
         } else {
             $whre['status > -1'] = null;
         }
-        if($_SESSION['admin_info']['biz_id']){
-            $biz_ids = implode(',',$_SESSION['admin_info']['biz_id']);
+        if ($_SESSION['admin_info']['biz_id']) {
+            $biz_ids = implode(',', $_SESSION['admin_info']['biz_id']);
             $where["id in ($biz_ids)"] = null;
         }
         $province_id && $where['province_id'] = $province_id;
diff --git a/admin/views/biz/store/lists.php b/admin/views/biz/store/lists.php
index 7b15190e..c0d2e0b7 100755
--- a/admin/views/biz/store/lists.php
+++ b/admin/views/biz/store/lists.php
@@ -188,7 +188,7 @@
                 <div class="am-para-input">
                     <div class="am-g">
                         <label class="am-checkbox-inline" v-for="(v,i) in qdjl_lists">
-                            <input type="checkbox" :value="v.id" v-model="channel_uid"/> {{v.name}}
+                            <input type="checkbox" :value="v.id" v-model="channel_uid"/> {{v.city_name}}
                         </label>
                     </div>
                 </div>
@@ -249,7 +249,7 @@
             params: [],
             qdjl_lists: [],
             channel_uid: [],
-            biz_manage: {admins: [], group_id: 1, admin_id: 0, biz_id: 0, admin_name: ''},
+            biz_manage: {admins: [], group_id: 2, admin_id: 0, biz_id: 0, admin_name: ''},
             companyAry:<?=$companyAry ? json_encode($companyAry) : '[]'?>
         },
         mounted: function () {
@@ -301,11 +301,11 @@
             biz_manage_modal: function (biz_id) {
                 //选择门店管理员
                 var vm = this;
-                vm.biz_manage = {admins: [], group_id: 1, admin_id: 0, biz_id: biz_id, admin_name: ''};
+                vm.biz_manage = {admins: [], group_id: 2, admin_id: 0, biz_id: biz_id, admin_name: ''};
                 vm.users_group();
                 layer.open({
                     type: 1,
-                    area: ['50%'], //宽高
+                    area: ['50%','50%'], //宽高
                     content: $('#biz_manage-modal'),
                     title: '门店管理员',
                     shade: false,
@@ -361,6 +361,12 @@
                     _self.lists.brand = res.data;
                 }, 'json');
             },
+        },
+        watch: {
+            'biz_manage.group_id': function (nv, ov) {
+                var vm = this;
+                vm.users_group();
+            }
         }
     });
     require(['laydate', 'autocomplete'], function (laydate) {