Merge remote-tracking branch 'origin/build' into build

packages/xbot/AppSeatManagementXbot/components/GroupList.vue

@@ -59,13 +59,21 @@
           <div>{{editInfo.managerWxid}}</div>
         </el-form-item>
         <el-form-item label="人员关联" prop="managerTpUserName" style="width: 100%;" :rules="[{ required: true, message: '请选择人员' }]">
-          <el-input disabled size="small" v-model="editInfo.managerTpUserName" clearable placeholder="请选择人员">
+          <!-- <el-input disabled size="small" v-model="editInfo.managerTpUserName" clearable placeholder="请选择人员">
             <template slot="append">
               <ai-user-selecter refs="addTags" :isMultiple="false" :instance="instance" v-model="editInfo.user" @change="onChooseUser">
                 <el-button size="small">选择人员</el-button>
               </ai-user-selecter>
             </template>
-          </el-input>
+          </el-input> -->
+          <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
+            url="/app/appgirdmemberinfo/list" headerTitle="网格员列表"
+            :isMultiple="false" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
+            <template name="option" v-slot:option="{ item }">
+              <span class="iconfont iconProlife">{{ item.name }}</span>
+              <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
+            </template>
+          </ai-person-select>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -109,7 +117,8 @@ export default {
       dialog: false,
       editInfo: {},
       showArea: false,
-      areaInfo: {}
+      areaInfo: {},
+      chooseUserList: [],
     }
   },
   created() {
@@ -190,7 +199,7 @@ export default {
     edit(row) {
       this.dialog = true
       this.editInfo = {...row}
-      this.editInfo.user = [{id: row.managerTpwxid, name: row.managerTpUserName}]
+      this.chooseUserList = [{id: row.managerTpwxid, name: row.managerTpUserName}]
     },
     onChooseUser(v) {
       this.editInfo.wxUserId = v[0].id
@@ -235,6 +244,16 @@ export default {
         }
       });
     },
+
+    selectPerson(val) {
+      if (val) {
+        this.editInfo.managerTpUserName = val.name
+        this.editInfo.wxUserId = val.wxUserId
+      } else {
+        this.editInfo.managerTpUserName = ''
+        this.editInfo.wxUserId = ''
+      }
+    },
   },
 }
 </script>

project/biaopin/AppWorkOrder/components/Detail.vue

@@ -30,7 +30,8 @@
                 <ai-info-item label="现场照片" isLine>
                   <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
                 </ai-info-item>
-                <ai-info-item label="所属网格">{{ detail.girdName }}</ai-info-item>
+                <ai-info-item label="所属网格" v-if="detail.eventSource == 0 || detail.eventSource == 1">{{ detail.girdName }}</ai-info-item>
+                <ai-info-item label="所属群聊" v-else>{{ detail.wxGroupName }}</ai-info-item>
                 <ai-info-item label="事件位置" isLine>
                   <div id="map" style="width: 500px; height: 280px;"></div>
                 </ai-info-item>
@@ -621,7 +622,7 @@ export default {
     onConfirmEdit() {
       this.$refs.editInfo.validate(v => {
         if (v) {
-          this.instance.post('/app/apppatrolreportinfov2/addByGirdMember', {
+          this.instance.post('/app/apppatrolreportinfov2/update', {
             ...this.editInfo,
             id: this.$route.query.id
           }).then(res => {

project/biaopin/AppWorkOrder/components/List.vue

@@ -70,7 +70,7 @@
             class="search-input"
             size="small"
             v-throttle="() => {search.current = 1, getList()}"
-            :placeholder="currIndex == 1 ? '敏感词、涉及对象、姓名、手机号' : '请输入内容描述/上报人员/联系方式'"
+            :placeholder="placeholderTextList[currIndex]"
             clearable
             @change="getList"
             @clear="search.current = 1, search.content = '', getList()"
@@ -139,6 +139,7 @@ export default {
       ],
       currIndex: 0,
       rightBtnTextList: ['工单特征库', '敏感关键词', '事件类型', '事件类型'],
+      placeholderTextList: ['请输入内容描述/昵称', '请输入内容描述/姓名', '请输入内容描述/上报人员/联系方式', '请输入内容描述/上报人员/联系方式'],
       colConfigs: []
     }
   },