From 074f77fac0578c80948ce754263bb95969fea1ad Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 15 Aug 2024 10:47:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?xbot=E5=B8=AD=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/GroupList.vue | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue index 5f1466f3..d90f6bd6 100644 --- a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue +++ b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue @@ -59,13 +59,21 @@
{{editInfo.managerWxid}}
- + + + + @@ -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,18 @@ export default { } }); }, + + selectPerson(val) { + if (val) { + this.editInfo.managerTpUserName = val.name + this.editInfo.wxUserId = val.wxUserId + this.editInfo.managerTpwxid = val.id + } else { + this.editInfo.managerTpUserName = '' + this.editInfo.wxUserId = '' + this.editInfo.managerTpwxid = '' + } + }, }, } From daa79e7b1bb95d473c6267f9156766de801d3ec3 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 15 Aug 2024 10:55:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/biaopin/AppWorkOrder/components/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/biaopin/AppWorkOrder/components/Detail.vue b/project/biaopin/AppWorkOrder/components/Detail.vue index c397e099..d1c25780 100644 --- a/project/biaopin/AppWorkOrder/components/Detail.vue +++ b/project/biaopin/AppWorkOrder/components/Detail.vue @@ -621,7 +621,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 => { From c3f46fcd50c02ab7f9d6eb4927a29412b2f74e81 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 15 Aug 2024 11:10:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B8=AD=E4=BD=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/xbot/AppSeatManagementXbot/components/GroupList.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue index d90f6bd6..4a909a80 100644 --- a/packages/xbot/AppSeatManagementXbot/components/GroupList.vue +++ b/packages/xbot/AppSeatManagementXbot/components/GroupList.vue @@ -249,11 +249,9 @@ export default { if (val) { this.editInfo.managerTpUserName = val.name this.editInfo.wxUserId = val.wxUserId - this.editInfo.managerTpwxid = val.id } else { this.editInfo.managerTpUserName = '' this.editInfo.wxUserId = '' - this.editInfo.managerTpwxid = '' } }, }, From 3f389d2f43baf63302f0bc991e5d1062afdf86d8 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 15 Aug 2024 13:42:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/biaopin/AppWorkOrder/components/List.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/biaopin/AppWorkOrder/components/List.vue b/project/biaopin/AppWorkOrder/components/List.vue index 35fd6bd7..936b43b1 100644 --- a/project/biaopin/AppWorkOrder/components/List.vue +++ b/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: [] } }, From 6a295b67d8b47bcf48dbd163d5e57c58ae265231 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 15 Aug 2024 16:39:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/biaopin/AppWorkOrder/components/Detail.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/biaopin/AppWorkOrder/components/Detail.vue b/project/biaopin/AppWorkOrder/components/Detail.vue index d1c25780..a7e0c0a5 100644 --- a/project/biaopin/AppWorkOrder/components/Detail.vue +++ b/project/biaopin/AppWorkOrder/components/Detail.vue @@ -30,7 +30,8 @@ - {{ detail.girdName }} + {{ detail.girdName }} + {{ detail.wxGroupName }}