From 9a738ad2945668d00474ab92f48cf8b902e015b3 Mon Sep 17 00:00:00 2001 From: hanchaobo Date: Mon, 29 Jan 2024 18:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=B0=83=E8=A7=A3=E5=91=98?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/confirmMediator.vue | 181 ++++++++++-------- .../components/departmentMediator.vue | 153 +++++++-------- .../components/selectMediator.vue | 58 +----- vue.config.js | 6 +- 4 files changed, 180 insertions(+), 218 deletions(-) diff --git a/src/views/caseManagement/components/confirmMediator.vue b/src/views/caseManagement/components/confirmMediator.vue index 849031a..a55bb92 100644 --- a/src/views/caseManagement/components/confirmMediator.vue +++ b/src/views/caseManagement/components/confirmMediator.vue @@ -2,19 +2,13 @@
-
- - 同意 - 拒绝 - -
-
-
调解员
+
+
选择调解员
- - + @@ -25,24 +19,45 @@ - - - - +
+
当前调解员
+
+ + + + + +
+
申请人调解员
+
+ + + + + +
+
被申请人调解员
+
+ + + + +
取 消 @@ -61,37 +76,27 @@ export default { data() { return { tableData: [], + tableDataNow: [], + applicantTable: [], + respondentTable: [], multipleSelection: [], + tableDataFlag: false, formLabelAlign: { time: [] }, - formTimeArr: [], mediatorArr: [], - confirmFlag: 1, - confirmShow: true, }; }, watch: { confirmVisable(val) { if (val) { - this.confirmFlag = 1; this.mediatorArr = []; - this.formTimeArr = []; this.selectReservationFn({ id: this.confirmData.id }) - } - }, - confirmFlag(val) { - if (val == 1) { - this.confirmShow = true; - console.log(this.confirmData.id); - this.selectReservationFn({ id: this.confirmData.id }) - } else { - this.confirmShow = false; listMediator().then(res => { this.tableData = res.data; }) } - } + }, }, methods: { cancel() { @@ -99,8 +104,14 @@ export default { }, selectReservationFn(data) { selectReservation(data).then(res => { - this.tableData = res.data.mediatorList; - this.formLabelAlign.time[0] = res.data.herDates[0]; + this.applicantTable = res.data.mediatorList; + this.respondentTable = res.data.resMediatorList; + this.tableDataNow = [{ mediatorId: res.data.mediatorId, mediatorName: res.data.mediatorName }]; + if (this.tableDataNow.length > 0) { + this.tableDataFlag = false; + } else { + this.tableDataFlag = true; + } }) }, /**核实调解员 */ @@ -113,54 +124,62 @@ export default { }, /**提交选择结果*/ async submitMediator() { - if (this.confirmFlag == 1) { - let userArr = []; - this.tableData.forEach(item => { - userArr.push({ - userId: item.mediatorId, - userName: item.mediatorName - }) - }) + if (this.multipleSelection.length == 0 && this.tableDataNow.length > 0) { this.verifyMediatorFn({ id: this.confirmData.id, caseFlowId: this.confirmData.caseFlowId, - userList: userArr, - // herDates: this.formLabelAlign.time - }) - } else { - if (this.multipleSelection.length > 1) { - Message.error('最多选择一名调解员'); - return - } else if (this.multipleSelection.length < 1) { - Message.error('至少选择一名调解员'); - return - } - if (this.formLabelAlign.time.length < 1) { - Message.error('至少选择一个时间'); - return - } - this.formLabelAlign.time.forEach(item => { - item = moment( - item - ).format("YYYY-MM-DD HH:mm:ss"); - this.formTimeArr.push(item) - }) - this.multipleSelection.forEach(item => { - this.mediatorArr.push({ - userId: item.mediatorId, - userName: item.mediatorName - }) + mediatorId: this.tableDataNow[0].mediatorId, + mediatorName: this.tableDataNow[0].mediatorName, }) + } else if (this.multipleSelection.length > 0 && this.tableDataNow.length == 0) { this.verifyMediatorFn({ id: this.confirmData.id, caseFlowId: this.confirmData.caseFlowId, - userList: this.mediatorArr, - // herDates: this.formLabelAlign.time + mediatorId: this.multipleSelection[0].mediatorId, + mediatorName: this.multipleSelection[0].mediatorName, }) + } else if (this.multipleSelection.length > 1 && this.tableDataNow.length == 0) { + Message.error('最多选择一名调解员'); + return } + // if (this.confirmFlag == 1) { + // let userArr = []; + // this.tableData.forEach(item => { + // userArr.push({ + // userId: item.mediatorId, + // userName: item.mediatorName + // }) + // }) + // this.verifyMediatorFn({ + // id: this.confirmData.id, + // caseFlowId: this.confirmData.caseFlowId, + // userList: userArr, + // // herDates: this.formLabelAlign.time + // }) + // } else { + // if (this.multipleSelection.length > 1) { + // Message.error('最多选择一名调解员'); + // return + // } else if (this.multipleSelection.length < 1) { + // Message.error('至少选择一名调解员'); + // return + // } + // this.multipleSelection.forEach(item => { + // this.mediatorArr.push({ + // userId: item.mediatorId, + // userName: item.mediatorName + // }) + // }) + // this.verifyMediatorFn({ + // id: this.confirmData.id, + // caseFlowId: this.confirmData.caseFlowId, + // userList: this.mediatorArr, + // }) + // } }, handleSelectionChange(val) { this.multipleSelection = val; + console.log(val, "PPPPPPPPPPPPPPPPPPPP"); } }, }; diff --git a/src/views/caseManagement/components/departmentMediator.vue b/src/views/caseManagement/components/departmentMediator.vue index 3b3b5ab..c46f9ed 100644 --- a/src/views/caseManagement/components/departmentMediator.vue +++ b/src/views/caseManagement/components/departmentMediator.vue @@ -2,19 +2,13 @@
-
- - 同意 - 拒绝 - -
-
-
调解员
+
+
选择调解员
- - + @@ -25,28 +19,49 @@ - - - - +
+
当前调解员
+
+ + + + + +
+
申请人调解员
+
+ + + + + +
+
被申请人调解员
+
+ + + + +
- 取 消 - 确 认 + 取 消 + 确 认
@@ -54,44 +69,34 @@