From 6a5d9237399fd48c4bee8080a57778127fdeee6d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 10 Feb 2022 15:26:55 +0800
Subject: [PATCH] 27196

---
 .../apps/AppAskForm/components/Statistics.vue |  2 +-
 .../apps/AppGridMember/components/add.vue     | 36 +++++++++++--------
 project/sass/apps/AppResident/AppResident.vue |  3 +-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/project/sass/apps/AppAskForm/components/Statistics.vue b/project/sass/apps/AppAskForm/components/Statistics.vue
index c6f8f006..5de65aa5 100644
--- a/project/sass/apps/AppAskForm/components/Statistics.vue
+++ b/project/sass/apps/AppAskForm/components/Statistics.vue
@@ -9,7 +9,7 @@
           <ai-wrapper label-width="90px">
             <ai-info-item label="表单名称" :value="info.title" isLine></ai-info-item>
             <ai-info-item label="发布状态"><span :style="{color: dict.getColor('questionnaireStatus', info.status)}">已发布</span></ai-info-item>
-            <!-- <ai-info-item label="创建人" openType="userName" :value="info.createUserName"></ai-info-item> -->
+            <ai-info-item label="创建人" openType="userName" :value="info.createUserName"></ai-info-item>
             <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
             <ai-info-item label="截止时间" :value="info.periodValidityEndTime ? info.periodValidityEndTime : '永久有效'"></ai-info-item>
             <ai-info-item label="提交次数限制" :value="info.commitType === '1' ? '限提交一次' : '不限次数' "></ai-info-item>
diff --git a/project/sass/apps/AppGridMember/components/add.vue b/project/sass/apps/AppGridMember/components/add.vue
index 6fe32a7b..735ef3ca 100644
--- a/project/sass/apps/AppGridMember/components/add.vue
+++ b/project/sass/apps/AppGridMember/components/add.vue
@@ -21,14 +21,13 @@
             <template slot="content">
               <div class="above" v-if="editOne==true">
                 <div class="left">
-                  <el-form-item label="网格员姓名" prop="name" >
-                    <el-input v-model="forms.name" placeholder="请选择网格员" disabled>
-                      <template #append>
-                        <AiUserGet :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
-                          <el-button size="small" type="primary"><span style="color: #fff">选择成员</span></el-button>
-                        </AiUserGet>
-                      </template>
-                    </el-input>
+                  <el-form-item label="网格员姓名" prop="wxUserId" >
+                    <div class="flex-box">
+                      <ai-open-data :style="{marginRight: forms.wxUserId ? '20px' : 0}" type="userName" :openid="forms.wxUserId" />
+                      <AiUserGet :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
+                        <el-button size="small" type="primary"><span style="color: #fff">选择网格员</span></el-button>
+                      </AiUserGet>
+                    </div>
                   </el-form-item>
                   <el-form-item label="选用日期" prop="selectionDate" >
                     <el-date-picker
@@ -323,8 +322,8 @@ export default {
         }
       };
       return {
-        name: [
-          { required: true, message: "请输入网格员姓名", trigger: "change" },
+        wxUserId: [
+          { required: true, message: "请选择网格员", trigger: "change" },
         ],
         selectionDate: [
           { required: true, message: "请选择选用日期", trigger: "change" },
@@ -375,10 +374,13 @@ export default {
       this.forms.photo = val[0].url;
     },
     getSelectPerson(val) {
-      this.forms.name = val[0].name;
-      this.forms.phone = val[0].phone;
-      this.forms.userId = val[0].sysUserId
-      this.forms.wxUserId = val[0].id
+      if (val.length) {
+        this.forms.name = val[0].wxOpenUserId;
+        this.forms.userId = val[0].id
+        this.forms.wxUserId = val[0].wxOpenUserId
+
+        this.$refs.rules.validateField('wxUserId')
+      }
     },
     getCheckedTree() {
       if (!this.$refs.tree.getCheckedNodes().length) {
@@ -487,6 +489,12 @@ export default {
 .add {
   height: 100%;
 
+
+  .flex-box {
+    display: flex;
+    align-items: center;
+  }
+
     .form-flex {
       display: flex;
       align-items: center;
diff --git a/project/sass/apps/AppResident/AppResident.vue b/project/sass/apps/AppResident/AppResident.vue
index e2509f05..9a179c2c 100644
--- a/project/sass/apps/AppResident/AppResident.vue
+++ b/project/sass/apps/AppResident/AppResident.vue
@@ -47,8 +47,7 @@ export default {
           value: e.dictValue,
           comp: ListTpl,
           detail: details[e.dictName]
-        })),
-        {label: "居民统计", value: "3", comp: ResidentSta},
+        }))
       ]
     },
     hideLevel() {