diff --git a/src/views/register/add.vue b/src/views/register/add.vue index 05361ed..1812209 100644 --- a/src/views/register/add.vue +++ b/src/views/register/add.vue @@ -550,23 +550,31 @@ export default { if(this.formData.length !== 0){ let tmp = this.formData.filter(item => item.username !== '') console.log(tmp) + if(tmp.length !== 0){ if(this.pageType == 'add'){ let tmp1 = this.typeData.find(item => item.id == this.form.disputeId) - if(!tmp1){ - params = { + let tmp2 = this.winData.find(item => item.id == this.form.disposeDept) + params = { ...this.form, visitors:tmp, - disputeName:this.form.disputeId, - disputeId:'' + disputeName:!tmp1 ? this.form.disputeId : '', + disputeId:tmp1 ? this.form.disputeId : '', + disposeDept:tmp2 ? this.form.disposeDept : '', + disposeDeptName:!tmp2 ? this.form.disposeDept : '', } - }else{ - params={ - visitors:tmp, - ...this.form, - disputeId:this.form.disputeId - } - } + // if(!tmp1){ + + // }else{ + // params={ + // visitors:tmp, + // ...this.form, + // disputeId:this.form.disputeId + // } + // } + // if(tmp2){ + + // } console.log(params) addRegister(params).then(res =>{ if(res.data.code == 200){ @@ -587,20 +595,29 @@ export default { visitors:tmp, } let tmp1 = this.typeData.find(item => item.id == this.form.disputeId) - if(!tmp1){ - params = { + let tmp2 = this.winData.find(item => item.id == this.form.disposeDept) + params = { ...this.form, visitors:tmp, - disputeName:this.form.disputeId, - disputeId:'' + disputeName:!tmp1 ? this.form.disputeId : '', + disputeId:tmp1 ? this.form.disputeId : '', + disposeDept:tmp2 ? this.form.disposeDept : '', + disposeDeptName:!tmp2 ? this.form.disposeDept : '', } - }else{ - params={ - visitors:tmp, - ...this.form, - disputeId:this.form.disputeId - } - } + // if(!tmp1){ + // params = { + // ...this.form, + // visitors:tmp, + // disputeName:this.form.disputeId, + // disputeId:'' + // } + // }else{ + // params={ + // visitors:tmp, + // ...this.form, + // disputeId:this.form.disputeId + // } + // } addRegister(params).then(res =>{ if(res.data.code == 200){ this.$message.success('提交成功!') diff --git a/src/views/register/recon.vue b/src/views/register/recon.vue index ba4ffbb..33f086c 100644 --- a/src/views/register/recon.vue +++ b/src/views/register/recon.vue @@ -152,7 +152,7 @@ clearable filterable ref="searchSelect" - placeholder="请选择诉求类型" + placeholder="请选择所属镇街" size="medium" style="width: 90%" > @@ -195,7 +195,7 @@
@@ -210,7 +210,7 @@
 何单位处理过 -
+
@@ -231,6 +231,14 @@ />
+
+ +
@@ -244,7 +252,7 @@ v-model="form.protocol" :disabled="pageType == 'edit' || pageType == 'recon'" size="medium" - :placeholder="pageType == 'recon' ? '请输入基层有无协议书' : pageType == 'edit' ? '无' : '无'" + :placeholder="pageType == 'recon' ? '无' : pageType == 'edit' ? '无' : '无'" clearable style="width: 90%" /> @@ -261,7 +269,7 @@ v-model="form.opinion" :disabled="pageType == 'edit' || pageType == 'recon'" size="medium" - :placeholder="pageType == 'recon' ? '请输入基层有无处理意见' : pageType == 'edit' ? '无' : '无'" + :placeholder="pageType == 'recon' ? '无' : pageType == 'edit' ? '无' : '无'" clearable style="width: 90%" /> @@ -281,7 +289,7 @@ :disabled="pageType == 'edit' || pageType == 'recon'" v-model="form.reviewOpinion" size="medium" - :placeholder="pageType == 'recon' ? '请输入部门有无复查意见' : pageType == 'edit' ? '无' : '无'" + :placeholder="pageType == 'recon' ? '无' : pageType == 'edit' ? '无' : '无'" clearable style="width: 90%" /> @@ -299,7 +307,7 @@ :disabled="pageType == 'edit' || pageType == 'recon'" v-model="form.legalPaper" size="medium" - :placeholder="pageType == 'recon' ? '请输入法律文书' : pageType == 'edit' ? '无' : '无'" + :placeholder="pageType == 'recon' ? '无' : pageType == 'edit' ? '无' : '无'" clearable style="width: 90%" /> @@ -375,7 +383,7 @@ filterable allow-create ref="searchSelect" - placeholder="请选择单位" + placeholder="请选择越级上报级别" size="medium" style="width: 90%" > @@ -877,7 +885,7 @@ export default { { required: true, message: "请选择办理状态", trigger: "change" }, ], mediatorName:[ - { required: true, message: "请输入调解员姓名", trigger: "change" }, + { required: true, message: "请输入调解员姓名", trigger: "blur" }, ] }, formData: [ @@ -966,13 +974,15 @@ export default { disputeId: res.data.data.disputeId, disputeName:res.data.data.disputeName, disposeDept: res.data.data.disposeDept, + disposeDeptName:res.data.data.disposeDeptName, protocol: res.data.data.protocol, opinion: res.data.data.opinion, reviewOpinion: res.data.data.reviewOpinion, legalPaper: res.data.data.legalPaper, problemDesc: res.data.data.problemDesc, visitTime:res.data.data.regTime, - skipGrant:res.data.data.skipGrant + skipGrant:res.data.data.skipGrant, + skipGrantLevel:res.data.data.skipGrantLevel == -1 ? '' : res.data.data.skipGrantLevel }; this.isShowImg = res.data.data.mediationId == '' ? true : false @@ -1033,6 +1043,11 @@ export default { this.form.dutyDeptIds = this.form.dutyDeptIds !== '' ? this.form.dutyDeptIds.split(',') : '' this.recordData = this.form.talkingHisList; this.form.personNum = this.formData.length; + if(res.data.data.mediationId !== '' && res.data.data.fileList.length !== 0){ + this.isShowImg = true + }else{ + this.isShowImg = false + } this.title = row.talkingTime + '调解记录' if(this.form.fileList.length !== 0){ this.form.fileList.map((item) => { diff --git a/vue.config.js b/vue.config.js index 797e9f0..a66f05d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -30,8 +30,8 @@ module.exports = { // target: 'http://localhost', // target: "http://192.168.1.106:80", // target: "http://192.168.1.3:8083", - target: "http://192.168.1.106:80", - // target: "http://127.0.0.1:10000", + // target: "http://192.168.1.106:80", + target: "http://127.0.0.1:10000", //远程演示服务地址,可用于直接启动项目 //target: 'https://saber.bladex.vip/api', ws: true,