diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 28e404d..148b6e7 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -202,7 +202,7 @@
-

+

{{item.deptName}}{{item.userName}}

diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue index 7b0e5b2..417e7f8 100644 --- a/src/views/administrative/appointmentDetail.vue +++ b/src/views/administrative/appointmentDetail.vue @@ -100,7 +100,7 @@
-

+

{{item.deptName}}{{item.userName}}

diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 6d75167..dc1ff3a 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -165,7 +165,7 @@
-

+

{{item.deptName}}{{item.userName}}

diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index e78d43a..659321a 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -148,7 +148,7 @@
-

+

{{item.deptName}}{{item.userName}}

diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index d01a47a..af7520d 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -45,7 +45,7 @@
-

+

{{item.deptName}}{{item.userName}}

@@ -205,7 +205,7 @@ const data = reactive({ popupContent2: '', imgstr: "", lawList: [{ text:"", id:"" }], - lawCer:[{ text:"", id:"" }], + lawCer:[{ text:"", id:"", show:"", num:"" }], imageList:[], show: ref(false) }); @@ -258,6 +258,22 @@ const submitData = reactive({ isUnite: 0, isSubmit: 0, uniteCheck:"", + /** 执法部门 */ + lawEnforcement:"", + /** 执法部门ID */ + lawEnforcementId:"", + /** 执法人员 */ + lawEnforcer:"", + lawCertificateNum:"", + lawEnforcerText: "", + /** 执法人员ID */ + lawEnforcerId:"", + /** 执法人员2 */ + lawEnforcerTwo:"", + lawCertificateNumTwo:"", + lawEnforcerTextTwo: "", + /** 执法人员2ID */ + lawEnforcerTwoId:"", }) const tapGood = () => { @@ -431,6 +447,19 @@ const goBack = () => { router.go(-1); }; +const reciveVisible = (item) =>{ + 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 +} + const checkUnite = () => { if (data.checked) { data.deptChecked=true; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 62a1683..6c1b925 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -232,7 +232,7 @@
-

+

{{item.deptName}}{{item.userName}}

@@ -665,7 +665,7 @@ // status: 'done', // 图片状态,'uploading'、'done'或者'failed' // } // ) - + } },error=>{ console.log("保存失败") @@ -676,6 +676,27 @@ showSuccessToast('临时保存'); submitData.userId = useCommon.userId; + if (submitData.lawCertificateNumText.length <= 0 + || submitData.bureauDeptName.length <= 0 + // || submitData.lawFieldText.length <= 0 + || submitData.checkCategoryText.length <= 0 + || data.lawCer[0].id.length <= 0) { + return null; + } + data.overlayShow = true; // 遮罩层 + submitData.userId = useCommon.userId; + submitData.isUnite = 0; + if (data.checked) { submitData.isUnite = 1; } + //联合检查 + + // 处理回显附件 + for (var k = 0; k < data.fileListObj.length; k++) { + var url = data.fileListObj[k].url; + if (null != url) { + submitData.fileList.push(url); + } + } + // 执法依据 submitData.lawEnforcementBasis = ""; submitData.lawEnforcementBasisText = ""; @@ -686,36 +707,27 @@ submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1); submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1); - // 是否联合执法 - if (success.data.userObjs.length > 1) { - data.checked = true; - } - // submitData.deptTexts = ""; - // submitData.deptObjs = []; - // for (var i=0; i{ + // 执法人员 + submitData.lawEnforcerTwoId = ""; + submitData.lawEnforcerTwo = ""; + submitData.lawCertificateNum = ""; + submitData.lawEnforcerTextTwo = ""; + for (var i=0; i{ + data.overlayShow = false; // 遮罩层 //跳转企业二维码地址 if(success.success){ showSuccessToast('保存成功'); - router.push({ path: "/enforceHome" }); + router.push({ path: "/historyCheck" }); } },error=>{ console.log("保存失败")