From 47d44a94b87ef966ef943c4e230c004f33720dfa Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 7 Jun 2022 16:34:09 +0800
Subject: [PATCH] BUG 30018

---
 examples/router/axios.js                      |  2 +-
 .../beta/grid/AppGridBlock/components/add.vue | 29 +++++--------------
 project/beta/grid/components/AiUserPicker.vue |  7 +++--
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 4b1c210d..511a36e5 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -10,7 +10,7 @@ instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.use(config => {
   if (config.url.startsWith("/node")) {
     config.baseURL = "/ns"
-  } else if (/\/project\/grid/.test(location.pathname)) {
+  } else if (/\/project\/beta/.test(location.pathname)) {
     config.baseURL = "/wg"
   } else if (/\/project\/sass/.test(location.pathname)) {
     config.baseURL = "/saas"
diff --git a/project/beta/grid/AppGridBlock/components/add.vue b/project/beta/grid/AppGridBlock/components/add.vue
index d01f5a14..6bd7ea5d 100644
--- a/project/beta/grid/AppGridBlock/components/add.vue
+++ b/project/beta/grid/AppGridBlock/components/add.vue
@@ -17,10 +17,10 @@
                 <el-input v-model="forms.girdName" placeholder="请输入…" :maxlength="50" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="网格长" prop="girdMemberManageList">
-                <ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" isShowUser :props="{label:'name', id: 'id'}"/>
+                <ai-user-picker :instance="instance" v-model="forms.girdMemberManageList" :props="{label:'name', id: 'id'}"/>
               </el-form-item>
               <el-form-item label="网格员" prop="girdMemberList">
-                <ai-user-picker :instance="instance" v-model="forms.girdMemberList" isShowUser :props="{label:'name', id: 'id'}"/>
+                <ai-user-picker :instance="instance" v-model="forms.girdMemberList" :props="{label:'name', id: 'id'}"/>
               </el-form-item>
             </template>
           </ai-card>
@@ -158,25 +158,12 @@ export default {
     save() {
       this.$refs["rules"].validate((valid) => {
         if (valid) {
-          this.instance
-          .post(
-              `/app/appgirdinfo/addOrUpdate`,
-              {
-                ...this.forms,
-                girdMemberManageList: this.forms.girdMemberManageList.length ? this.forms.girdMemberManageList.map(v => {
-                  return {
-                    wxUserId: v.wxOpenUserId || v.wxUserId
-                  }
-                }) : [],
-                girdMemberList: this.forms.girdMemberList.length ? this.forms.girdMemberList.map(v => {
-                  return {
-                    wxUserId: v.wxOpenUserId || v.wxUserId
-                  }
-                }) : []
-              },
-              null
-          )
-          .then((res) => {
+          let {girdMemberManageList, girdMemberList} = this.forms
+          this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
+            ...this.forms,
+            girdMemberManageList: girdMemberManageList?.map(v => ({wxUserId: v.id})) || [],
+            girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || []
+          }).then((res) => {
             if (res.code == 0) {
               this.cancel(true)
             }
diff --git a/project/beta/grid/components/AiUserPicker.vue b/project/beta/grid/components/AiUserPicker.vue
index 60c4d1e6..82e6e303 100644
--- a/project/beta/grid/components/AiUserPicker.vue
+++ b/project/beta/grid/components/AiUserPicker.vue
@@ -16,16 +16,19 @@
         <span>选择</span>
       </div>
     </div>
-    <ai-dialog title="选择人员" :visible.sync="dialog" width="1100px" @onConfirm="submit" @closed="selected=[]">
-      <ai-table-select :instance="instance" v-model="selected" multiple action="/app/wxcp/wxuser/list?status=1"/>
+    <ai-dialog title="选择人员" :visible.sync="dialog" width="1100px" @onConfirm="submit" @close="selected=[]">
+      <ai-table-select1 :instance="instance" v-model="selected" multiple action="/app/wxcp/wxuser/list?status=1" valueObj extra="mobile"/>
     </ai-dialog>
   </section>
 </template>
 
 <script>
 
+import AiTableSelect1 from "../AppGridMember/components/AiTableSelect";
+
 export default {
   name: "AiUserPicker",
+  components: {AiTableSelect1},
   model: {
     prop: 'value',
     event: 'change',