diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index b30d3ba..5cd5f67 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -23,7 +23,8 @@ + start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" + @change="caseTimeChange"> @@ -46,8 +47,8 @@ @@ -64,33 +65,37 @@ - + + :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"> + @@ -103,11 +108,12 @@ - + - - + @@ -293,12 +299,12 @@ export default { // this.getList(this.queryParams); }); if (this.$route.query.caseFlowId) { - let querydata = Number(this.$route.query.caseFlowId); - if (querydata > 0) { - this.$set(this.queryParams, 'caseFlowId', querydata) - } + let querydata = Number(this.$route.query.caseFlowId); + if (querydata > 0) { + this.$set(this.queryParams, 'caseFlowId', querydata) } - this.getList(this.queryParams); + } + this.getList(this.queryParams); }, methods: { /**所有按钮事件 */ @@ -684,15 +690,33 @@ export default { let paramValues = { ids: [row.id], }; - this.$modal - .confirm("你确定要案件送达吗?") - .then((res) => { - msCaseFile(paramValues).then((res) => { - this.$modal.msgSuccess("案件送达成功"); - this.getList(this.queryParams); - }); - }) - .catch(() => { }); + this.$confirm("你确定要案件送达吗?", "提示", { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + callback: () => { }, + beforeClose: (action, ctx, close) => { + if (action !== 'confirm') { + close(); + return; + } + ctx.confirmButtonLoading = true; + msCaseFile(paramValues).then((res) => { + this.$modal.msgSuccess("案件送达成功"); + close(); + this.getList(this.queryParams); + }).finally(() => { + ctx.confirmButtonLoading = false; + }) + } + }).finally(() => { }) + // .then((res) => { + // msCaseFile(paramValues).then((res) => { + // this.$modal.msgSuccess("案件送达成功"); + // this.getList(this.queryParams); + // }); + // }) + // .catch(() => { }); }, //申请人签收调解书 signMediation(row) { diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue index 0e28319..0d2bcec 100644 --- a/src/views/caseManagement/components/addCase.vue +++ b/src/views/caseManagement/components/addCase.vue @@ -633,6 +633,8 @@ export default { this.$set(this.formData.affiliate, "code", this.getUserInfoList.idCard); this.$set(this.formData.affiliate, "applicationEmail", this.getUserInfoList.email); this.$set(this.formData.affiliate, "applicationPhone", this.getUserInfoList.phonenumber); + this.$set(this.formData.affiliate, "idType", this.getUserInfoList.idType); + this.$set(this.formData.affiliate, "nationality", this.getUserInfoList.nationality); } this.activeName = "first"; this.showmediate = false; diff --git a/vue.config.js b/vue.config.js index c4fc8c2..dfb7aa2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,10 +12,10 @@ 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:7001' //生产 -// const API = 'http://121.40.189.20:6001' //测试 +const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B // const API = 'http://172.16.0.237:6001' //Q -const API = 'http://172.16.1.26:6001' //w +// const API = 'http://172.16.1.26:6001' //w // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions