From fe30539c44390ea7a198037b6e32330a8a15b90e Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sat, 30 Sep 2023 15:40:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?'=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=A1=88?= =?UTF-8?q?=E4=BB=B6=E5=BD=95=E5=85=A5=E5=9B=9E=E6=98=BE=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/components/caseentryDialog.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 17e8bd7..f962c14 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -117,6 +117,7 @@ 点击上传
- 文件支持上传jpg/png、.doc/docx、pdf文件 + 文件支持上传.jpg，png，.doc，docx，.txt，.pdf文件
@@ -791,6 +792,7 @@ export default { this.applicateArr = []; this.quiltArr = []; this.formData = this.form; + this.fileList = []; if (this.flag == "1" || this.flag == "0") { this.form2.paymentArr = this.initpaymentArr; this.form3.paymentArr1 = this.initpaymentArr1; From 353bbeecdcfdd800f2f733b9383f4833ca02f892 Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sat, 30 Sep 2023 18:12:56 +0800 Subject: [PATCH 02/11] =?UTF-8?q?'=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=90=8E=E9=A2=84=E8=A7=88=EF=BC=8C=E6=A1=88=E4=BB=B6=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E6=88=90=E5=8A=9F=E9=A1=B5=E9=9D=A2=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E5=85=B3=E9=97=AD'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/components/caseentryDialog.vue | 4 ++-- src/views/caseManagement/components/payDialog.vue | 5 +++-- .../paymentManagement/components/paymentdetailsDialog.vue | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index f962c14..99d71d4 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -851,9 +851,9 @@ export default { return window.location.origin + "/API/evidence/upload"; }, handlePreview(file) { - if (file.certificatePath) { + if (file && file.response.data.annexName) { window.open( - window.location.origin + "/API" + file.certificatePath, + window.location.origin + "/API" + file.response.data.annexName, "_blank" ); } else { diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue index 3c4ae0c..847a541 100644 --- a/src/views/caseManagement/components/payDialog.vue +++ b/src/views/caseManagement/components/payDialog.vue @@ -71,9 +71,10 @@ export default { selectCaseApplicationConfirmFn(parms) { selectCaseApplicationConfirm(parms).then(res => { console.log(res, this.form, "KKKKKKKKKKKKKKKKKKKK"); - if(res.data.paymentStatus == 1){ + if(res && res.data && res.data.paymentStatus == 1){ clearInterval(this.timer); - this.openPay = false; + // this.openPay = false; + this.payCancel() this.$message({ message: "缴费成功", type: "success", diff --git a/src/views/paymentManagement/components/paymentdetailsDialog.vue b/src/views/paymentManagement/components/paymentdetailsDialog.vue index fe803c1..6cccef8 100644 --- a/src/views/paymentManagement/components/paymentdetailsDialog.vue +++ b/src/views/paymentManagement/components/paymentdetailsDialog.vue @@ -64,7 +64,7 @@ export default { }; }, watch: { - openDialog: { + detailform: { handler(val) { if (val) { setTimeout(() => { From 6f16473ce87d476e14b307b815a10956dc20fbfd Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sun, 1 Oct 2023 15:20:33 +0800 Subject: [PATCH 03/11] =?UTF-8?q?'=E7=AD=BE=E5=90=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/awardManagement/components/paymentdetailsDialog.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/awardManagement/components/paymentdetailsDialog.vue b/src/views/awardManagement/components/paymentdetailsDialog.vue index f063fea..351a24f 100644 --- a/src/views/awardManagement/components/paymentdetailsDialog.vue +++ b/src/views/awardManagement/components/paymentdetailsDialog.vue @@ -66,6 +66,7 @@ label-width="300px" label-position="left" :rules="rules" + :disabled="flag == 3" > Date: Sun, 1 Oct 2023 16:11:25 +0800 Subject: [PATCH 04/11] =?UTF-8?q?'=E6=A1=88=E4=BB=B6=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/caseentryDialog.vue | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 99d71d4..e4f1768 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -794,22 +794,22 @@ export default { this.formData = this.form; this.fileList = []; if (this.flag == "1" || this.flag == "0") { - this.form2.paymentArr = this.initpaymentArr; - this.form3.paymentArr1 = this.initpaymentArr1; - console.log(this.caseAttachList, "caseAttachList"); - this.caseAttachList.forEach((item) => { - if (item.annexType == 2) { - this.applicateArr.push(item.annexName); - } - if (item.annexType == 6) { - this.quiltArr.push(item.annexName); - } - }); - this.fileList = this.caseAttachList; - this.fileList.forEach((item) => { - item["name"] = item.annexName; - item["certificatePath"] = item.annexPath; - }); + this.form2.paymentArr = this.initpaymentArr; + this.form3.paymentArr1 = this.initpaymentArr1; + console.log(this.caseAttachList, "caseAttachList"); + this.caseAttachList.forEach((item) => { + if (item.annexType == 2) { + this.applicateArr.push(item.annexName); + } + if (item.annexType == 6) { + this.quiltArr.push(item.annexName); + } + }); + this.fileList = this.caseAttachList; + this.fileList.forEach((item) => { + item["name"] = item.annexName; + item["certificatePath"] = item.annexPath; + }); } if (this.flag == "2") { this.form2.paymentArr = [ @@ -851,13 +851,16 @@ export default { return window.location.origin + "/API/evidence/upload"; }, handlePreview(file) { - if (file && file.response.data.annexName) { + if (this.flag == "2") { window.open( window.location.origin + "/API" + file.response.data.annexName, "_blank" ); - } else { - this.$message.warning("暂不支持预览"); + } else if (this.flag == "1") { + window.open( + window.location.origin + "/API" + file.certificatePath, + "_blank" + ); } }, From 42f6046d8acbffe8ea3fd3649ed29fdb7283843e Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sun, 1 Oct 2023 18:27:55 +0800 Subject: [PATCH 05/11] =?UTF-8?q?'=E6=96=87=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=96=87=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E7=AC=A6=E4=BF=AE=E5=A4=8D'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/caseentryDialog.vue | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index e4f1768..adfb6d2 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -148,7 +148,7 @@ >
- {{ item }} + {{ item.annexName }}
@@ -163,8 +163,8 @@ " >
- - {{ item }} + + {{ item.annexName }}
@@ -798,11 +798,18 @@ export default { this.form3.paymentArr1 = this.initpaymentArr1; console.log(this.caseAttachList, "caseAttachList"); this.caseAttachList.forEach((item) => { + console.log(item, "iytem"); if (item.annexType == 2) { - this.applicateArr.push(item.annexName); + this.applicateArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); } if (item.annexType == 6) { - this.quiltArr.push(item.annexName); + this.quiltArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); } }); this.fileList = this.caseAttachList; @@ -1006,10 +1013,17 @@ export default { } }); }, - // 详情显示，展示案件文件 + // 详情显示，展示申请人案件文件 toFile(item, index) { window.open( - window.location.origin + "/API" + this.caseAttachList[index].annexPath, + window.location.origin + "/API" + this.applicateArr[index].annexPath, + "_black" + ); + }, + // 被申请人文件 + toFile1(item, index) { + window.open( + window.location.origin + "/API" + this.quiltArr[index].annexPath, "_black" ); }, From 38494f8b4b18c2311a09604058a3b74f13e23c40 Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Fri, 6 Oct 2023 18:27:06 +0800 Subject: [PATCH 06/11] =?UTF-8?q?'=E4=BB=B2=E8=A3=81=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91=EF=BC=8C=E8=B4=A8?= =?UTF-8?q?=E8=AF=81=E6=97=A0=E4=BB=B2=E8=A3=81=E5=91=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E5=A4=8D'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arbitratorsManagement/arbitratorsList.vue | 230 ++++++++++++++++++ .../components/arbitratorDialog.vue | 114 +++++++++ .../components/formateCourtDialog.vue | 19 +- 3 files changed, 361 insertions(+), 2 deletions(-) create mode 100644 src/views/arbitratorsManagement/arbitratorsList.vue create mode 100644 src/views/arbitratorsManagement/components/arbitratorDialog.vue diff --git a/src/views/arbitratorsManagement/arbitratorsList.vue b/src/views/arbitratorsManagement/arbitratorsList.vue new file mode 100644 index 0000000..c885f0e --- /dev/null +++ b/src/views/arbitratorsManagement/arbitratorsList.vue @@ -0,0 +1,230 @@ + + + + + \ No newline at end of file diff --git a/src/views/arbitratorsManagement/components/arbitratorDialog.vue b/src/views/arbitratorsManagement/components/arbitratorDialog.vue new file mode 100644 index 0000000..c7c0217 --- /dev/null +++ b/src/views/arbitratorsManagement/components/arbitratorDialog.vue @@ -0,0 +1,114 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManagement/components/formateCourtDialog.vue b/src/views/caseManagement/components/formateCourtDialog.vue index 266a240..b179c43 100644 --- a/src/views/caseManagement/components/formateCourtDialog.vue +++ b/src/views/caseManagement/components/formateCourtDialog.vue @@ -8,7 +8,7 @@ :destroy-on-close="true" center > - + 是 @@ -16,12 +16,14 @@ + 当前案件未指定仲裁员，请先指定仲裁员！ +

Date: Sat, 7 Oct 2023 10:52:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?'=E7=BB=84=E5=BA=AD=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E5=81=8F=E7=A7=BB=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/components/courtReviewDialog.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/caseManagement/components/courtReviewDialog.vue b/src/views/caseManagement/components/courtReviewDialog.vue index a5865b0..3fa14b8 100644 --- a/src/views/caseManagement/components/courtReviewDialog.vue +++ b/src/views/caseManagement/components/courtReviewDialog.vue @@ -122,4 +122,7 @@ export default { // line-height: 48px; } } +::v-deep .el-form-item__error { + left: 90px; +} \ No newline at end of file From 860573389b1b4327e08b166f9639a33a09666abe Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sat, 7 Oct 2023 14:22:38 +0800 Subject: [PATCH 08/11] =?UTF-8?q?'=E8=A3=81=E5=86=B3=E4=B9=A6=E9=80=81?= =?UTF-8?q?=E8=BE=BE=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E6=B8=85=E9=99=A4'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../awardManagement/components/MailawardDialog.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/awardManagement/components/MailawardDialog.vue b/src/views/awardManagement/components/MailawardDialog.vue index b575c2f..55c4cda 100644 --- a/src/views/awardManagement/components/MailawardDialog.vue +++ b/src/views/awardManagement/components/MailawardDialog.vue @@ -111,8 +111,14 @@ export default { formData: {}, }; }, - mounted () { - this.formData = {}; + watch: { + openMailawardDialog: { + handler(val) { + if (val) { + this.formData = {}; + } + }, + }, }, methods: { submitForm() { From 08aef12740f2855808754e597e34cbf93aaab9ee Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sun, 8 Oct 2023 11:28:27 +0800 Subject: [PATCH 09/11] =?UTF-8?q?'=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/awardManagement/listofAwards.vue | 15 ++++++- .../components/caseentryDialog.vue | 39 ++++++++++++++++--- .../components/paymentdetailsDialog.vue | 30 ++++++-------- src/views/paymentManagement/paymentList.vue | 2 + 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/src/views/awardManagement/listofAwards.vue b/src/views/awardManagement/listofAwards.vue index ae2794d..c033bd4 100644 --- a/src/views/awardManagement/listofAwards.vue +++ b/src/views/awardManagement/listofAwards.vue @@ -44,7 +44,7 @@ v-hasPermi="['monitor:online:forceLogout']">确认裁决书 签名 - 用印申请 { + // this.$modal.msgSuccess(text + "成功"); + }) + .catch(function () { + // row.status = row.status === "0" ? "1" : "0"; + }); + }, // 送达裁决书弹框 showMailaward(row) { this.mailawardata = row; diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index adfb6d2..97f86ed 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -17,7 +17,10 @@ label-width="150px" :disabled="flag == '0'" > -

案件信息：

+
+
+
案件信息：
+
@@ -197,7 +200,11 @@ >
-

申请人主体信息：

+
+
+
申请人主体信息：
+
+ -

代理人信息：

+
+
+
代理人信息：
+
+
-

被申请人主体信息：

+
+
+
被申请人主体信息：
+
+ -

代理人信息：

+
+
+
代理人信息：
+
+ - + - + - + - + + {{ form.caseStatusName }} - + + + {{ form.paymentStatusName }} +
@@ -67,10 +62,7 @@ export default { detailform: { handler(val) { if (val) { - setTimeout(() => { - this.form = this.detailform; - console.log(this.form, "this.form"); - }, 1000); + this.form = val; } }, }, @@ -98,7 +90,7 @@ export default { \ No newline at end of file diff --git a/src/views/caseManagement/components/payDialog.vue b/src/views/caseManagement/components/payDialog.vue index 847a541..c36d770 100644 --- a/src/views/caseManagement/components/payDialog.vue +++ b/src/views/caseManagement/components/payDialog.vue @@ -18,9 +18,11 @@ {{ form.respondentName }} - {{ - form.caseStatusName - }} + + + {{ form.caseStatusName }} + + {{ form.arbitratClaims }} From a71e242acdfbde2fabb7af66e5326aa15e5e854c Mon Sep 17 00:00:00 2001 From: hhl123456789 <3118891075@qq.com> Date: Sun, 8 Oct 2023 16:51:59 +0800 Subject: [PATCH 11/11] =?UTF-8?q?'=E5=BF=AB=E9=80=92=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/expressDeliveryDialog.vue | 101 ++++++++++++++++++ src/views/awardManagement/listofAwards.vue | 38 ++++++- 2 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 src/views/awardManagement/components/expressDeliveryDialog.vue diff --git a/src/views/awardManagement/components/expressDeliveryDialog.vue b/src/views/awardManagement/components/expressDeliveryDialog.vue new file mode 100644 index 0000000..fcb395f --- /dev/null +++ b/src/views/awardManagement/components/expressDeliveryDialog.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/src/views/awardManagement/listofAwards.vue b/src/views/awardManagement/listofAwards.vue index c033bd4..9b8f828 100644 --- a/src/views/awardManagement/listofAwards.vue +++ b/src/views/awardManagement/listofAwards.vue @@ -33,7 +33,12 @@ - + + + + @@ -90,11 +102,12 @@ import { } from "@/api/awardManagement/awardManagement"; import paymentdetailsDialog from "./components/paymentdetailsDialog.vue"; import mailawardDialog from './components/MailawardDialog.vue'; +import expressDeliveryDialog from './components/expressDeliveryDialog.vue'; export default { name: "paymentList", dicts: ["case_status"], - components: { paymentdetailsDialog, mailawardDialog }, + components: { paymentdetailsDialog, mailawardDialog, expressDeliveryDialog }, data() { return { queryParams: { @@ -124,6 +137,7 @@ export default { flag: null, openMailawardDialog: false, //送达裁决书页面 mailawardata: {}, //裁决书送达界面数据 + showDelivery: false, //快递信息弹框 }; }, created() { @@ -193,6 +207,24 @@ export default { // row.status = row.status === "0" ? "1" : "0"; }); }, + // 快递信息弹框 + showDeliveryModel(row) { + console.log(row,'快递'); + this.showDelivery = true + }, + closeDeliveryModel() { + this.showDelivery = false + }, + // 案件归档 + showCasefilingModel() { + this.$modal.confirm('是否确认立即进行案件扫描？').then( + function () {} + ).then(() => { + + }).catch(function () { + + }) + }, // 送达裁决书弹框 showMailaward(row) { this.mailawardata = row;