From 8d0e2d4b7e7745fe66fa7a9929a217f549203b2f Mon Sep 17 00:00:00 2001 From: gyj Date: Thu, 30 Nov 2023 18:36:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=8B=E7=BC=A9?= =?UTF-8?q?=E5=8C=85=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/caseCompressionPackage.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/caseManagement/components/caseCompressionPackage.vue b/src/views/caseManagement/components/caseCompressionPackage.vue index dcf12e8..806cce0 100644 --- a/src/views/caseManagement/components/caseCompressionPackage.vue +++ b/src/views/caseManagement/components/caseCompressionPackage.vue @@ -138,13 +138,24 @@ export default { this.$emit("cancelCompreess"); this.upload.isUploading = false; this.$refs.uploadZipBatch.clearFiles(); - this.$alert( + if(response.code ==200){ + this.$alert( "
" + response.msg + "
", "导入结果", { dangerouslyUseHTMLString: true } - ); + ) + }else{ + this.$alert( + "
" + + "导入压缩失败" + + "
", + "导入结果", + { dangerouslyUseHTMLString: true } + ) + } + this.getcaseApply(this.queryParams); }, }, From b3ca534a51f2870f5300a5f4000a282a1efa32d6 Mon Sep 17 00:00:00 2001 From: gyj Date: Thu, 30 Nov 2023 21:16:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseManagement/caseList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index e79a80a..481bd28 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -837,7 +837,7 @@ export default { }, // 表格显示高亮 tableRowClassName(row){ - if(row.row.caseStatus==8){ + if(row.row.arbitratMethodName=="开庭审理"){ return 'pendingTrial' } From cec5f1982c5a2d0112c89f7991cd56761d521305 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 30 Nov 2023 22:10:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/paymentdetailsDialog.vue | 16 +++++++++++----- .../components/archiveDetailsDialog.vue | 6 +++--- .../components/caseentryExamine.vue | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/awardManagement/components/paymentdetailsDialog.vue b/src/views/awardManagement/components/paymentdetailsDialog.vue index 9de44d8..85e945d 100644 --- a/src/views/awardManagement/components/paymentdetailsDialog.vue +++ b/src/views/awardManagement/components/paymentdetailsDialog.vue @@ -74,10 +74,11 @@ v-model="arbitrateRecord.verificaOpinion" /> --> - + + - + @@ -111,6 +112,7 @@ export default { data() { return { // key: value + arbitrateRecordt: {}, form: {}, arbitrateRecord: { checkOpinion:"同意" @@ -190,7 +192,7 @@ export default { setTimeout(() => { this.form = this.detailform; console.log(this.detailform) - if(this.form.arbitrateRecord.checkOpinion == null ){ + if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){ this.form.arbitrateRecord.checkOpinion = '同意' } this.arbitrateRecord = this.form.arbitrateRecord; @@ -204,6 +206,12 @@ export default { // 申请人裁决书 evidenceFile(val) { if (val) { + this.applicantFileArr = []; + this.applicantPathArr = []; + this.respondentFileArr = []; + this.respondenPathArr = []; + this.awardFileArr = []; + this.awardPathArr = []; this.bookFileArr = []; this.bookPathArr = []; val.caseAttachList.forEach((item) => { @@ -214,8 +222,6 @@ export default { this.respondentFileArr.push(item.annexName); this.respondenPathArr.push(item.annexPath); } else if (item.annexType == 3) { - this.awardFileArr = []; - this.awardPathArr = []; this.awardFileArr.push(item.annexName); this.awardPathArr.push(item.annexPath); } else if (item.annexType == 7) { diff --git a/src/views/caseFiling/components/archiveDetailsDialog.vue b/src/views/caseFiling/components/archiveDetailsDialog.vue index 80a6dd7..184e870 100644 --- a/src/views/caseFiling/components/archiveDetailsDialog.vue +++ b/src/views/caseFiling/components/archiveDetailsDialog.vue @@ -16,11 +16,11 @@ - + - +
diff --git a/src/views/caseManagement/components/caseentryExamine.vue b/src/views/caseManagement/components/caseentryExamine.vue index e011e44..5f0bc41 100644 --- a/src/views/caseManagement/components/caseentryExamine.vue +++ b/src/views/caseManagement/components/caseentryExamine.vue @@ -165,7 +165,7 @@
- + From 667342205199b5458b54c3fa0f4eda9b1416519c Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 1 Dec 2023 01:40:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=A3=81=E5=86=B3?= =?UTF-8?q?=E4=B9=A6=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/paymentdetailsDialog.vue | 19 ++++++++++--------- vue.config.js | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/views/awardManagement/components/paymentdetailsDialog.vue b/src/views/awardManagement/components/paymentdetailsDialog.vue index 85e945d..22f663f 100644 --- a/src/views/awardManagement/components/paymentdetailsDialog.vue +++ b/src/views/awardManagement/components/paymentdetailsDialog.vue @@ -78,7 +78,7 @@ - + @@ -115,7 +115,8 @@ export default { arbitrateRecordt: {}, form: {}, arbitrateRecord: { - checkOpinion:"同意" + // checkOpinion:"同意" + checkOpinion:"" }, // 表单校验 rules: { @@ -189,15 +190,15 @@ export default { (this.respondenPathArr = []), //被申请人 (this.awardFileArr = []), //裁决书 (this.awardPathArr = []), //裁决书 - setTimeout(() => { + // setTimeout(() => { this.form = this.detailform; - console.log(this.detailform) - if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){ - this.form.arbitrateRecord.checkOpinion = '同意' - } - this.arbitrateRecord = this.form.arbitrateRecord; + // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){ + // this.form.arbitrateRecord.checkOpinion = '同意'; + this.arbitrateRecord.checkOpinion = ''; + // } + // this.arbitrateRecord = this.form.arbitrateRecord; this.evidenceFile(this.form); - }, 1000); + // }, 1000); } }, }, diff --git a/vue.config.js b/vue.config.js index 32e1aed..97c528c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页 const port = process.env.port || process.env.npm_config_port || 80 // 端口 -// const API = 'http://121.40.189.20:9001' //生产 -const API = 'http://121.40.189.20:8001' //测试 +const API = 'http://121.40.189.20:9001' //生产 +// const API = 'http://121.40.189.20:8001' //测试 // const API = 'http://192.168.3.18:9001' //B // const API = 'http://192.168.3.77:9001' //Q From f28be0bd167436c3bc19f75da128279d7c33b78c Mon Sep 17 00:00:00 2001 From: gyj Date: Fri, 1 Dec 2023 13:20:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BA=BA=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B9=A6?= =?UTF-8?q?=E9=9D=A2=E5=AE=A1=E7=90=86=E6=97=B6=E4=B8=8D=E8=A6=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=A7=86=E9=A2=91tab=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/caseFiling/components/archiveDetailsDialog.vue | 2 +- src/views/caseManagement/components/caseentryDialog.vue | 2 +- vue.config.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/caseFiling/components/archiveDetailsDialog.vue b/src/views/caseFiling/components/archiveDetailsDialog.vue index 184e870..859fde9 100644 --- a/src/views/caseFiling/components/archiveDetailsDialog.vue +++ b/src/views/caseFiling/components/archiveDetailsDialog.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 79f7f13..e5384ef 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -163,7 +163,7 @@ message: '申请人不能为空', trigger: 'blur', }, - { max: 20, message: '长度应小于20个字符', trigger: 'blur' } + { max: 50, message: '长度应小于50个字符', trigger: 'blur' } ]"> diff --git a/vue.config.js b/vue.config.js index 97c528c..32e1aed 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页 const port = process.env.port || process.env.npm_config_port || 80 // 端口 -const API = 'http://121.40.189.20:9001' //生产 -// const API = 'http://121.40.189.20:8001' //测试 +// const API = 'http://121.40.189.20:9001' //生产 +const API = 'http://121.40.189.20:8001' //测试 // const API = 'http://192.168.3.18:9001' //B // const API = 'http://192.168.3.77:9001' //Q