diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 253234a..f4e033a 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -28,7 +28,7 @@ export function creatTrialRecord(data) { // 确认生成笔录 export function creatTrialRecordnew(data) { return request({ - url: "/caseApplication/creatTrialRecordnew", + url: "/caseApplication/confirmMeetingResult", method: "post", data: data, }); diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 0551644..569a677 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -181,13 +181,13 @@ @click="showModel(scope.row, 0)">查看裁决书 秘书确认 + @click="showModel(scope.row, 1)">核验裁决书 仲裁员确认 + @click="showModel(scope.row, 4)">审核裁决书 部门长确认 + @click="showModel(scope.row, 2)">审核裁决书 签名 @@ -1033,6 +1033,7 @@ export default { }, // 表格显示高亮 tableRowClassName(row){ + console.log(row) if(row.row.arbitratMethodName=="开庭审理"){ return 'pendingTrial' } diff --git a/src/views/caseManagement/components/judgmentInformation.vue b/src/views/caseManagement/components/judgmentInformation.vue index 8458632..e3f029c 100644 --- a/src/views/caseManagement/components/judgmentInformation.vue +++ b/src/views/caseManagement/components/judgmentInformation.vue @@ -77,14 +77,33 @@ --> - - + +
{{awardDetailform.arbitrateReject}}
 - -
{{arbitrateRecord.arbitrateReject}}lllllllllllllll
+ +
{{awardDetailform.deptorReject}}
 - - + + + + + + + 同意 + 驳回 + + + + + + + @@ -96,11 +115,11 @@
提 交 - 同 意 - 驳 回 - 提 交 - 同 意 - 驳 回 + 5提交 + + + + 提交 取 消
@@ -121,6 +140,7 @@ export default { return { // key: value arbitrateRecordt: {}, + agreeOrNotCheck:1, form: {}, arbitrateRecord: { // checkOpinion:"同意" @@ -175,7 +195,7 @@ export default { required: true, message: "意见不能为空", trigger: "blur", - }, + } ], // arbitrateReject: [ // { @@ -196,6 +216,13 @@ export default { }; }, watch: { + openDialogInfor:{ + handler(val) { + if (val) { + this.agreeOrNotCheck = 1; + } + }, + }, awardDetailform: { handler(val) { if (val) { @@ -270,7 +297,8 @@ export default { this.cancel(); // this.$emit("updataList"); this.$emit("getcaseApply", this.queryParams); - this.$message("成功"); + // this.$message("成功"); + this.$modal.msgSuccess("提交成功"); }); }, //审核裁决书 @@ -279,16 +307,19 @@ export default { this.cancel(); // this.$emit("updataList"); this.$emit("getcaseApply", this.queryParams); - this.$message("成功"); + // this.$message("成功"); + this.$modal.msgSuccess("提交成功"); }); }, // 仲裁员审核裁决书 arbitratorCheckArbitrateRecordFn(parms) { + console.log(parms) arbitratorCheckArbitrateRecord(parms).then((res) => { this.cancel(); // this.$emit("updataList"); this.$emit("getcaseApply", this.queryParams); - this.$message("成功"); + // this.$message("成功"); + this.$modal.msgSuccess("提交成功"); }); }, // 签名 @@ -320,51 +351,64 @@ export default { arbitrateRecord: this.arbitrateRecord, }); } else if (parms == 1) { - this.checkArbitrateRecordFn({ + if(this.agreeOrNotCheck==1){ + //部门长同意 + this.checkArbitrateRecordFn({ id: this.form.id, agreeOrNotCheck: 1, arbitrateRecord: this.arbitrateRecord, }); - } else if (parms == 2) { - if (!that.arbitrateRecord.arbitrateReject == "") { - this.$message.error('请输入拒绝原因'); - return - } else { - this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject; - delete this.arbitrateRecord.arbitrateReject; + }else if(this.agreeOrNotCheck==2){ + // 部门长驳回 this.checkArbitrateRecordFn({ id: this.form.id, agreeOrNotCheck: 2, arbitrateRecord: this.arbitrateRecord, }); - } + } + } else if (parms == 2) { + // if (!that.arbitrateRecord.arbitrateReject == "") { + // this.$message.error('请输入拒绝原因'); + // return + // } else { + // this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject; + // delete this.arbitrateRecord.arbitrateReject; + // this.checkArbitrateRecordFn({ + // id: this.form.id, + // agreeOrNotCheck: 2, + // arbitrateRecord: this.arbitrateRecord, + // }); + // } } else if (parms == 3) { this.adjudicationSignatureFn({ id: this.form.id, }); - } else if (parms == 4) { - let paramsData = {}; - paramsData.arbitrateRecord = this.arbitrateRecord; - paramsData.id = this.form.id - this.getRegenerationDocument(paramsData) - } else if (parms == 5) { - this.arbitratorCheckArbitrateRecordFn({ + }else if (parms == 6) { + if(this.agreeOrNotCheck==1){ + //仲裁员同意 + this.arbitratorCheckArbitrateRecordFn({ id: this.form.id, agreeOrNotCheck: 1, arbitrateRecord: this.arbitrateRecord, }); - } else if (parms == 6) { - debugger - if (!that.arbitrateRecord.arbitrateReject) { - this.$message.error('请输入拒绝原因'); - return - } else { - this.arbitratorCheckArbitrateRecordFn({ + }else if(this.agreeOrNotCheck==2){ + //仲裁员驳回 + this.arbitratorCheckArbitrateRecordFn({ id: this.form.id, agreeOrNotCheck: 2, arbitrateRecord: this.arbitrateRecord, }); - } + } + // if (!that.arbitrateRecord.arbitrateReject) { + // this.$message.error('请输入拒绝原因'); + // return + // } else { + // this.arbitratorCheckArbitrateRecordFn({ + // id: this.form.id, + // agreeOrNotCheck: 2, + // arbitrateRecord: this.arbitrateRecord, + // }); + // } } } }); diff --git a/vue.config.js b/vue.config.js index 39f102c..b104233 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,8 +12,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://172.16.1.26:8001' //Bs + const API = 'http://121.40.189.20:8001' //测试 +// const API = 'http://172.16.1.26:8001' //Bs // const API = 'http://192.168.3.77:9001' //Q // const API = 'http://172.16.1.26:8001' //W