From bc8d545a045fe8db3bcb836081f516baae5dd229 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Thu, 1 Aug 2024 12:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=89=A7=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointment.vue | 73 +++++++++++++--- src/views/administrative/appointmentEdit.vue | 89 +++++++++++++++++--- src/views/enforce/sign.vue | 2 +- src/views/enterprise/complaintDetailView.vue | 39 +++++---- src/views/enterprise/registrationDetail.vue | 3 +- 5 files changed, 163 insertions(+), 43 deletions(-) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index aec653a..75d0a48 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -98,13 +98,22 @@ readonly label="执法人员" /> - + + + + + + + + { + const addLawCer = () =>{ + data.lawCer.push({ text:"", id:"", show:"", num:"" }); + } + const showPopup = (flag) => { + data.lawCerFlag = flag; data.popupVisible = true; } const closePopup = () => { @@ -336,10 +350,15 @@ data.deptChecked = false; } const reciveVisible = (item) => { - submitData.lawEnforcerTwo = item.userName - submitData.lawCertificateNumTwo = item.lawCertificateNum; - submitData.lawEnforcerTwoId = item.userId; - submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo + data.lawCer[data.lawCerFlag].id = item.userId; + data.lawCer[data.lawCerFlag].text = item.userName; + data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; + data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum; + + // submitData.lawEnforcerTwo = item.userName + // submitData.lawCertificateNumTwo = item.lawCertificateNum; + // submitData.lawEnforcerTwoId = item.userId; + // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } @@ -405,6 +424,21 @@ submitData.lawCertificateNum = null; submitData.isUnite = 0; if (data.checked) { submitData.isUnite = 1; } + // 执法人员 + submitData.lawEnforcerTwoId = ""; + submitData.lawEnforcerTwo = ""; + submitData.lawCertificateNum = ""; + submitData.lawEnforcerTextTwo = ""; + for (var i=0; i { //跳转企业二维码地址 if (success.success) { @@ -424,6 +458,21 @@ submitData.lawCertificateNum = null; submitData.isUnite = 0; if (data.checked) { submitData.isUnite = 1; } + // 执法人员 + submitData.lawEnforcerTwoId = ""; + submitData.lawEnforcerTwo = ""; + submitData.lawCertificateNum = ""; + submitData.lawEnforcerTextTwo = ""; + for (var i=0; i { //跳转企业二维码地址 if (success.success) { diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 06ab0cd..06af6e2 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -95,12 +95,21 @@ readonly label="执法人员" /> - + + + + + + + { + const showPopup = (flag) =>{ + data.lawCerFlag = flag; data.popupVisible = true; } const closePopup = () =>{ @@ -290,10 +302,15 @@ data.deptChecked = false; } const reciveVisible = (item) =>{ - submitData.lawEnforcerTwo = item.userName - submitData.lawCertificateNumTwo = item.lawCertificateNum; - submitData.lawEnforcerTwoId = item.userId; - submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo + data.lawCer[data.lawCerFlag].id = item.userId; + data.lawCer[data.lawCerFlag].text = item.userName; + data.lawCer[data.lawCerFlag].num = item.lawCertificateNum; + data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum; + + // submitData.lawEnforcerTwo = item.userName + // submitData.lawCertificateNumTwo = item.lawCertificateNum; + // submitData.lawEnforcerTwoId = item.userId; + // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo // submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo } @@ -348,9 +365,6 @@ console.log(success); //跳转企业二维码地址 if(success.success){ - console.log("==================") - console.log(success.data) - console.log("==================") data.mainDeputyOrder = success.data.mainDeputyOrder; Object.keys(submitData).forEach((item) => { submitData[item] = success.data[item] ? success.data[item] : ""; @@ -369,6 +383,21 @@ submitData.deptTexts += success.data.deptObjs[i].deptName+";"; submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName }); } + // 执法人员 + console.log("===========> : ", success.data) + submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId']; + submitData.lawEnforcerTwo = success.data['lawEnforcerTwo']; + var lawEnforcer2ShowStr = success.data['lawEnforcer2Show']; + if ((null != submitData.lawEnforcerTwoId && submitData.lawEnforcerTwoId.length > 0) + && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) { + var tmpEnforceId = submitData.lawEnforcerTwoId.split(','); + var tmpEnforceText = submitData.lawEnforcerTwo.split(','); + var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); + data.lawCer = []; + for (var i = 0; i < tmpEnforceId.length; i++) { + data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]}); + } + } // showSuccessToast('保存成功'); } },error=>{ @@ -385,6 +414,21 @@ submitData.deptTexts = ""; submitData.deptObjs = []; } + // 执法人员 + submitData.lawEnforcerTwoId = ""; + submitData.lawEnforcerTwo = ""; + submitData.lawCertificateNum = ""; + submitData.lawEnforcerTextTwo = ""; + for (var i=0; i{ //跳转企业二维码地址 if(success.success){ @@ -408,6 +452,21 @@ submitData.deptTexts = ""; submitData.deptObjs = []; } + // 执法人员 + submitData.lawEnforcerTwoId = ""; + submitData.lawEnforcerTwo = ""; + submitData.lawCertificateNum = ""; + submitData.lawEnforcerTextTwo = ""; + for (var i=0; i{ //跳转企业二维码地址 @@ -437,6 +496,10 @@ } } + const addLawCer = () =>{ + data.lawCer.push({ text:"", id:"", show:"", num:"" }); + } + const getLinkageByValueAndParentId = (value, parentId) => { // 查询检查要求字典信息 queryLinkageDictByValueAndParentId({"value":value, "parentId": parentId}, success => { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 889ba13..e2c6e81 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -398,7 +398,7 @@ onMounted(() =>{ submitData.lawEnforcerId = success.data.userId submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; - // submitData.bureauDeptName = success.data.dept.deptName; + submitData.bureauDeptName = success.data.dept.deptName; } },error=>{ diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 40d16f6..a6d8ce6 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -72,15 +72,20 @@ />
-
- (不多于9张) -
- - - + + + + + + + + + +
@@ -264,15 +269,11 @@ return true; } onMounted(() => { - console.log("================") - console.log(submitData.userId); - console.log("================") submitData.relId = route?.query?.id; submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText; data.isSelect = route?.query?.isSelect; submitData.comOrOpi = route?.query?.comOrOpi; complaintInfoById({id:route?.query?.id},success =>{ - console.log(success.data); submitData.problemDescription = success.data.problemDescription; submitData.enterpriseAddress = success.data.enterpriseAddress; submitData.linkman = success.data.linkman; @@ -287,8 +288,16 @@ deptCode: success.data.params.res.handleOrgCode, evaluatorName: success.data.params.res.replyDetails, evaluatorPapersPhone: success.data.linkmanTel, - // backUrl: "http://jdm.szssfj.cn/enterprise", // 正式环境用这个 - backUrl: "http://192.168.31.196:3301/", + backUrl: "http://jdm.szssfj.cn/enterprise", // 正式环境用这个 + // backUrl: "http://192.168.31.196:3301/", + } + } + + if (null!=success.data.params.file && success.data.params.file.length > 0) { + for (var i=0; i ", success.data.params.file[i].uploadPath) + // submitData.fileList.push({"url": "http://127.0.0.1:85/"+success.data.params.file[i].uploadPath}) + submitData.fileList.push({"url": "http://10.132.108.3:85/"+success.data.params.file[i].uploadPath}) } } diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index a6401e1..ca08b34 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -80,8 +80,7 @@ rows="2" autosize type="textarea" - maxlength="" - placeholder="" + maxlength="50" show-word-limit readonly />