diff --git a/src/views/caseManagement/components/caseCompressionPackage.vue b/src/views/caseManagement/components/caseCompressionPackage.vue index 88caf25..7e902fa 100644 --- a/src/views/caseManagement/components/caseCompressionPackage.vue +++ b/src/views/caseManagement/components/caseCompressionPackage.vue @@ -47,6 +47,16 @@ + + + + + + + + + +
@@ -69,15 +79,26 @@ export default { // key: value, form: {}, fileList: [], + appList: [ + { id: 1, temName: "自然人" }, + { id: 2, temName: "机构" }, + ], + resList: [ + { id: 1, temName: "自然人" }, + { id: 2, temName: "机构" }, + ], templateList: [], loadingSubmit:false, rules: { - // upload: [ - // { required: true, message: "案件压缩包不能为空", trigger: "blur" }, - // ], templateId: [ { required: true, message: "裁决书模板不能为空", trigger: "blur" }, ], + applicantType: [ + { required: true, message: "申请人类型不能为空", trigger: "blur" }, + ], + resType: [ + { required: true, message: "被申请人类型不能为空", trigger: "blur" }, + ], }, paramsData:{ // templateId:this.form.templateId @@ -112,8 +133,9 @@ export default { }, methods: { submitForm() { - this.paramsData.templateId = this.form.templateId; + this.paramsData.applicantType = this.form.applicantType; + this.paramsData.resType = this.form.resType; this.$refs["form"].validate((valid) => { this.loadingSubmit = true if (valid) { @@ -126,7 +148,6 @@ export default { // 获取裁决书模板 getTemplateFn(data) { getTemplate(data).then(res => { - console.log(res.rows, "KKKKKKKKKKKKKKKKKKKKKKK"); this.templateList = res.rows; }) }, @@ -146,7 +167,6 @@ export default { }, // 下载模板 importTemplate downloadTemplate() { - // console.log("下载模板"); this.download( "caseApplication/uploadCaseZipFile", {}, @@ -159,7 +179,6 @@ export default { }, // 文件上传成功处理 handleFileSuccess(response, file, fileList) { - // this.upload.open = false; this.$emit("cancelCompreess"); this.upload.isUploading = false; this.$refs.uploadZipBatch.clearFiles(); @@ -183,8 +202,6 @@ export default { { dangerouslyUseHTMLString: true } ) } - - }, onError(){ this.loadingSubmit = false diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 45deaa5..6bf5443 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -270,7 +270,7 @@ - + @@ -281,7 +281,7 @@ message: '请选择性别', }, ]"> - + 男 女 @@ -554,7 +554,7 @@ - + @@ -565,7 +565,7 @@ message: '请选择性别', }, ]"> - + 男 女 @@ -820,7 +820,7 @@ export default { "initpaymentArr", "initpaymentArr1", "queryParams", - "caseAttachList", + // "caseAttachList", "columnValues", "detailsAwardForm" ], @@ -1086,147 +1086,112 @@ export default { }; }, watch: { - formData: { - handler(val) { - this.activeName = "first" - this.formGrab.list = this.columnValues - this.caseAttachListArr = [] - if (val) { - 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; - this.caseAttachList.forEach((item) => { - if (item.annexType == 2) { - this.applicateArr.push({ - annexName: item.annexName, - annexPath: item.annexPath, - }); - } - if (item.annexType == 6) { - this.quiltArr.push({ - annexName: item.annexName, - annexPath: item.annexPath, - }); - } - }); - if (this.caseAttachList.length > 0) { - this.caseAttachListArr = this.caseAttachList - } - this.caseAttachList.forEach((item) => { - if (item.annexType == 2) { - this.fileList.push(item) - } - }); - this.fileList.forEach((item) => { - item["name"] = item.annexName; - item["certificatePath"] = item.annexPath; - }); - } - if (this.flag == "2") { - this.form2 = { - applicant: [ - { - applicant: { - roleType: 1, - name: "", - idCard: "", - code: "", - phone: "", - compLegalPerson: "", - email: "", - home: "", - address: "", - idType: 0, - nationality: 1, - birth: "", - sex: "1", - operatorFlag: 1, - organizeFlag: 0, - }, - applicantAgent: { - roleType: 2, - name: "", - idCard: "", - code: "", - phone: "", - compLegalPerson: "", - email: "", - home: "", - address: "", - idType: 0, - nationality: 1, - birth: "", - sex: "1", - operatorFlag: 1, - organizeFlag: 0, - }, - }, - ], - res: [ - { - res: { - roleType: 3, - name: "", - idCard: "", - code: "", - phone: "", - compLegalPerson: "", - email: "", - home: "", - address: "", - idType: 0, - nationality: 1, - birth: "", - sex: "0", - operatorFlag: 1, - organizeFlag: 0, - }, - resAgent: { - roleType: 4, - name: "", - idCard: "", - code: "", - phone: "", - compLegalPerson: "", - email: "", - home: "", - address: "", - idType: 0, - nationality: 1, - birth: "", - sex: "", - operatorFlag: 1, - organizeFlag: 0, - } - } - ] - } - this.form3.paymentArr1 = [ - { - identityType: 2, - name: "", - identityNum: "", - contactTelphone: "", - email: "", - workAddress: "", - workTelphone: "", - contactAddress: "", - nameAgent: "", - contactTelphoneAgent: "", - contactAddressAgent: "", - }, - ]; - } - } - }, - deep: true, - }, visible(val) { + this.activeName = "first" + this.formGrab.list = this.columnValues + this.caseAttachListArr = [] + if (val) { + this.applicateArr = []; + this.quiltArr = []; + this.fileList = []; + + + if (this.flag == "2") { + this.form2 = { + applicant: [ + { + applicant: { + roleType: 1, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag: 1, + organizeFlag: 0, + }, + applicantAgent: { + roleType: 2, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "1", + operatorFlag: 1, + organizeFlag: 0, + }, + }, + ], + res: [ + { + res: { + roleType: 3, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "0", + operatorFlag: 1, + organizeFlag: 0, + }, + resAgent: { + roleType: 4, + name: "", + idCard: "", + code: "", + phone: "", + compLegalPerson: "", + email: "", + home: "", + address: "", + idType: 0, + nationality: 1, + birth: "", + sex: "", + operatorFlag: 1, + organizeFlag: 0, + } + } + ] + } + this.form3.paymentArr1 = [ + { + identityType: 2, + name: "", + identityNum: "", + contactTelphone: "", + email: "", + workAddress: "", + workTelphone: "", + contactAddress: "", + nameAgent: "", + contactTelphoneAgent: "", + contactAddressAgent: "", + }, + ]; + } + } if (val && (this.flag == "0" || this.flag == "1")) { setTimeout(() => { this.detailsAwardNum = this.detailsAwardForm; @@ -1258,6 +1223,33 @@ export default { item.resAgent = {} } }) + this.caseAttachList = data.caseAttachList; + this.caseAttachList.forEach((item) => { + if (item.annexType == 2) { + this.applicateArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + if (item.annexType == 6) { + this.quiltArr.push({ + annexName: item.annexName, + annexPath: item.annexPath, + }); + } + }); + if (this.caseAttachList.length > 0) { + this.caseAttachListArr = this.caseAttachList + } + this.caseAttachList.forEach((item) => { + if (item.annexType == 2) { + this.fileList.push(item) + } + }); + this.fileList.forEach((item) => { + item["name"] = item.annexName; + item["certificatePath"] = item.annexPath; + }); this.formData = data; this.form2 = data.affiliate; }) @@ -1308,7 +1300,7 @@ export default { // 文件上传成功 handlSuccess(res, file) { this.caseAttachListArr.push( - res.data, + res ); }, // 文件超出个数限制时的钩子 @@ -1330,8 +1322,6 @@ export default { return this.$confirm(`确定移除 ${file.name}？`); }, handleRemove(file, fileList) { - console.log(file) - console.log(fileList) console.log(this.caseAttachListArr) this.caseAttachListArr = this.caseAttachListArr.filter(item => item.annexId != file.annexId) // (this.caseAttachListArr = []), diff --git a/vue.config.js b/vue.config.js index b104233..e81c906 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:9001' //生产 - const API = 'http://121.40.189.20:8001' //测试 + 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 +// const API = 'http://172.16.0.103:8001' //W // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions