diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 8510535..4a35607 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -385,7 +385,8 @@ // var url = 'http://127.0.0.1:85/profile//EnforcementInspectionPlanTemplate.xlsx'; var url = 'http://jdm.szssfj.cn/jdmApi/profile//EnforcementInspectionPlanTemplate.xlsx'; // var url = 'http://10.132.108.3:85/profile//EnforcementInspectionPlanTemplate.xlsx'; - window.location.href = url; + // window.location.href = url; + window.open(url); // console.log(url); // szyptGetToken(param, success => { // let resMsg = success.data; diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 282a86d..cd0f69f 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -5,149 +5,97 @@
企业信息
- - + + -
- 执法信息 - 联 -
+ +
执法信息联
- - -
- - + +
+ + +
+ + +
+ + +
+ + +
+ + + + + + + +
+
+
+ 预览图片 + + + +
+
+ + +
+ +
+
+ +
+ + +
- -
- - +
+ + +
评价
+
+
+ +
+
+ +
+
+ +
- - - - - - - - - -
-
- -
-
- 预览图片 - - - -
-
- - -
- - -
- - -
评价
- -
-
- -
-
- -
-
- -
- - - - -
@@ -190,6 +138,7 @@ evaluateImageList: [], regList: [], lawList: [], + arrayLength: 1, }); //保存参数 const submitData = reactive({ @@ -452,164 +401,185 @@ }) } + const showArrays = (item) => { + if(item.downShow){ + item.downShow = false; + data.arrayLength = data.regList.length; + }else{ + data.regList[0].downShow = true; + data.arrayLength = 1; + } + } + const queryRegUniteById = () => { queryEnforcementRegistrationUniteById(route?.query?.id, success => { - convertReg(success.data['regResults']); - convertLaw(success.data['lawResults']); - - //评价信息 - submitData.isEvaluate = success.data['regResults'][0].isEvaluate; - if (null != success.data['regResults'][0].enterpriseEvaluate && "" != success.data['regResults'][0].enterpriseEvaluate) { - submitData.evaluateDescription = success.data['regResults'][0].enterpriseEvaluate.evaluateDescription; - submitData.linkman = success.data['regResults'][0].enterpriseEvaluate.linkman; - submitData.linkmanTel = success.data['regResults'][0].enterpriseEvaluate.linkmanTel; - submitData.authorization = success.data['regResults'][0].enterpriseEvaluate.authorization; - // submitData.inspectionEfficiency = success.data.enterpriseEvaluate.inspectionEfficiency; - submitData.serviceExperience = success.data['regResults'][0].enterpriseEvaluate.serviceExperience; - setEvaluateFile(success.data['regResults'][0].enterpriseEvaluate.id) - } - - console.log("=====> submitData.regList : ", data.regList) - console.log("=====> submitData.regList[0].enterpriseName : ", data.regList[0].enterpriseName) - + convertReg(success.data['regResults']).then(() => { + return convertLaw(success.data['lawResults']); + }).then(() => { + data.regList[0].downShow = true; + data.regList[data.regList.length-1].upShow = true; + + //评价信息 + submitData.isEvaluate = success.data['regResults'][0].isEvaluate; + if (null != success.data['regResults'][0].enterpriseEvaluate && "" != success.data['regResults'][0].enterpriseEvaluate) { + submitData.evaluateDescription = success.data['regResults'][0].enterpriseEvaluate.evaluateDescription; + submitData.linkman = success.data['regResults'][0].enterpriseEvaluate.linkman; + submitData.linkmanTel = success.data['regResults'][0].enterpriseEvaluate.linkmanTel; + submitData.authorization = success.data['regResults'][0].enterpriseEvaluate.authorization; + // submitData.inspectionEfficiency = success.data.enterpriseEvaluate.inspectionEfficiency; + submitData.serviceExperience = success.data['regResults'][0].enterpriseEvaluate.serviceExperience; + setEvaluateFile(success.data['regResults'][0].enterpriseEvaluate.id) + } + }); }, error => { }) } const convertReg = (regs) => { - for (var k = 0; k < regs.length; k++) { - let dt = regs[k]; - let obj = {}; - obj.id = dt.id; - obj.enterpriseName = dt.enterpriseName; - obj.enterpriseNumber = dt.enterpriseNumber; - obj.bureauDeptName = dt.bureauDeptName; - obj.lawEnforcerTwo = dt.lawEnforcerTwo; - obj.subsidiaryer = dt.subsidiaryer; - obj.lawEnforcementId = dt.lawEnforcementId; - obj.lawEnforcementItem = dt.lawEnforcementItem; - obj.lawEnforcementItemText = dt.lawEnforcementItemText; - obj.lawEnforcer = nameCorrect(dt.lawEnforcer); - obj.remark = dt.remark; - obj.enforce = dt.enforceReason; - obj.lawFieldText = dt.lawFieldText; - obj.checkCategoryText = dt.checkCategoryText; - obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime); - obj.lawEnforcementBasis = dt.lawEnforcementBasis; - obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; - - // 执法依据 - let lawList = []; - if ((null != obj.lawEnforcementBasis && obj.lawEnforcementBasis.length > 0) - && (null != obj.lawEnforcementBasisText && obj.lawEnforcementBasisText.length > 0)) { - var tmpBasis = obj.lawEnforcementBasis.split(','); - var tmpBasisText = obj.lawEnforcementBasisText.split(','); - lawList = []; - for (var i = 0; i < tmpBasis.length; i++) { - lawList.push({text: tmpBasisText[i], id: tmpBasis[i]}); - } - } - obj.lawList = lawList; - - // 执法人员 - let lawCer = []; - obj.lawEnforcerIdTwo = dt.lawEnforcerIdTwo; - obj.lawEnforcerTwo = dt.lawEnforcerTwo; - var lawEnforcer2ShowStr = dt.lawEnforcer2Show; - if ((null != obj.lawEnforcerIdTwo && obj.lawEnforcerIdTwo.length > 0) - && (null != obj.lawEnforcerTwo && obj.lawEnforcerTwo.length > 0)) { - var tmpEnforceId = obj.lawEnforcerIdTwo.split(','); - var tmpEnforceText = obj.lawEnforcerTwo.split(','); - var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); - data.lawCer = []; - for (var i = 0; i < tmpEnforceId.length; i++) { - lawCer.push({ - text: tmpEnforceText[i], - id: tmpEnforceId[i], - show: nameCorrect(lawEnforcer2Show[i]) - }); + return new Promise((res) => { + var proFlag = 0; + for (var k = 0; k < regs.length; k++) { + let dt = regs[k]; + let obj = {}; + obj.id = dt.id; + obj.enterpriseName = dt.enterpriseName; + obj.enterpriseNumber = dt.enterpriseNumber; + obj.bureauDeptName = dt.bureauDeptName; + obj.lawEnforcerTwo = dt.lawEnforcerTwo; + obj.subsidiaryer = dt.subsidiaryer; + obj.lawEnforcementId = dt.lawEnforcementId; + obj.lawEnforcementItem = dt.lawEnforcementItem; + obj.lawEnforcementItemText = dt.lawEnforcementItemText; + obj.lawEnforcer = nameCorrect(dt.lawEnforcer); + obj.remark = dt.remark; + obj.enforce = dt.enforceReason; + obj.lawFieldText = dt.lawFieldText; + obj.checkCategoryText = dt.checkCategoryText; + obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime); + obj.lawEnforcementBasis = dt.lawEnforcementBasis; + obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; + + // 执法依据 + let lawList = []; + if ((null != obj.lawEnforcementBasis && obj.lawEnforcementBasis.length > 0) + && (null != obj.lawEnforcementBasisText && obj.lawEnforcementBasisText.length > 0)) { + var tmpBasis = obj.lawEnforcementBasis.split(','); + var tmpBasisText = obj.lawEnforcementBasisText.split(','); + lawList = []; + for (var i = 0; i < tmpBasis.length; i++) { + lawList.push({text: tmpBasisText[i], id: tmpBasis[i]}); + } } - } - obj.lawCer = lawCer; - - // 附件 - getAttr(obj.id, success => { - if (success.data.filePreview != null) { - let images = []; - // if (success.data.filePreview.fileList != null) { - // for (var i = 0; i < success.data.filePreview.fileList.length; i++) { - // data.imgstr += success.data.filePreview.fileList[i] + ","; - // } - // data.imgstr = data.imgstr.substring(0, data.imgstr.length - 1); - // } - for (const key in success.data.filePreview.fileList) { - images[key] = success.data.filePreview.fileList[key]; + obj.lawList = lawList; + + // 执法人员 + let lawCer = []; + obj.lawEnforcerIdTwo = dt.lawEnforcerIdTwo; + obj.lawEnforcerTwo = dt.lawEnforcerTwo; + var lawEnforcer2ShowStr = dt.lawEnforcer2Show; + if ((null != obj.lawEnforcerIdTwo && obj.lawEnforcerIdTwo.length > 0) + && (null != obj.lawEnforcerTwo && obj.lawEnforcerTwo.length > 0)) { + var tmpEnforceId = obj.lawEnforcerIdTwo.split(','); + var tmpEnforceText = obj.lawEnforcerTwo.split(','); + var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); + data.lawCer = []; + for (var i = 0; i < tmpEnforceId.length; i++) { + lawCer.push({ + text: tmpEnforceText[i], + id: tmpEnforceId[i], + show: nameCorrect(lawEnforcer2Show[i]) + }); } - obj.images = images; - data.regList.push(obj); } - }, error => {}); - } + obj.lawCer = lawCer; + + // 附件 + getAttr(obj.id, success => { + proFlag++; + if (success.data.filePreview != null) { + let images = []; + // if (success.data.filePreview.fileList != null) { + // for (var i = 0; i < success.data.filePreview.fileList.length; i++) { + // data.imgstr += success.data.filePreview.fileList[i] + ","; + // } + // data.imgstr = data.imgstr.substring(0, data.imgstr.length - 1); + // } + for (const key in success.data.filePreview.fileList) { + images[key] = success.data.filePreview.fileList[key]; + } + obj.images = images; + data.regList.push(obj); + } + if (proFlag == regs.length) { + res(); + } + }, error => { + }); + } + }); } const convertLaw = (laws) => { - for (var k = 0; k < laws.length; k++) { - let dt = laws[k]; - let obj = {}; - obj.enterpriseName = dt.enterpriseName; - obj.enterpriseNumber = dt.enterpriseNumber; - obj.bureauDeptName = dt.bureauDeptName; - obj.lawEnforcerTwo = dt.lawEnforcerTwo; - obj.subsidiaryer = dt.subsidiaryer; - obj.lawEnforcementId = dt.lawEnforcementId; - obj.lawEnforcementItem = dt.lawEnforcementItem; - obj.lawEnforcementItemText = dt.lawEnforcementItemText; - obj.lawEnforcer = nameCorrect(dt.lawEnforcer); - obj.remark = dt.remark; - obj.enforce = dt.enforceReason; - obj.lawFieldText = dt.lawFieldText; - obj.checkCategoryText = dt.checkCategoryText; - obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime); - obj.lawEnforcementBasis = dt.lawEnforcementBasis; - obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; - - // 执法依据 - let lawList = []; - if ((null != obj.lawEnforcementBasis && obj.lawEnforcementBasis.length > 0) - && (null != obj.lawEnforcementBasisText && obj.lawEnforcementBasisText.length > 0)) { - var tmpBasis = obj.lawEnforcementBasis.split(','); - var tmpBasisText = obj.lawEnforcementBasisText.split(','); - data.lawList = []; - for (var i = 0; i < tmpBasis.length; i++) { - obj.lawList.push({text: tmpBasisText[i], id: tmpBasis[i]}); + return new Promise((res) => { + for (var k = 0; k < laws.length; k++) { + let dt = laws[k]; + let obj = {}; + obj.enterpriseName = dt.enterpriseName; + obj.enterpriseNumber = dt.enterpriseNumber; + obj.bureauDeptName = dt.bureauDeptName; + obj.lawEnforcerTwo = dt.lawEnforcerTwo; + obj.subsidiaryer = dt.subsidiaryer; + obj.lawEnforcementId = dt.lawEnforcementId; + obj.lawEnforcementItem = dt.lawEnforcementItem; + obj.lawEnforcementItemText = dt.lawEnforcementItemText; + obj.lawEnforcer = nameCorrect(dt.lawEnforcer); + obj.remark = dt.remark; + obj.enforce = dt.enforceReason; + obj.lawFieldText = dt.lawFieldText; + obj.checkCategoryText = dt.checkCategoryText; + obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime); + obj.lawEnforcementBasis = dt.lawEnforcementBasis; + obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; + + // 执法依据 + let lawList = []; + if ((null != obj.lawEnforcementBasis && obj.lawEnforcementBasis.length > 0) + && (null != obj.lawEnforcementBasisText && obj.lawEnforcementBasisText.length > 0)) { + var tmpBasis = obj.lawEnforcementBasis.split(','); + var tmpBasisText = obj.lawEnforcementBasisText.split(','); + data.lawList = []; + for (var i = 0; i < tmpBasis.length; i++) { + obj.lawList.push({text: tmpBasisText[i], id: tmpBasis[i]}); + } } - } - obj.lawList = lawList; - - // 执法人员 - let lawCer = []; - obj.lawEnforcerIdTwo = dt.lawEnforcerIdTwo; - obj.lawEnforcerTwo = dt.lawEnforcerTwo; - var lawEnforcer2ShowStr = dt.lawEnforcer2Show; - if ((null != obj.lawEnforcerIdTwo && obj.lawEnforcerIdTwo.length > 0) - && (null != obj.lawEnforcerTwo && obj.lawEnforcerTwo.length > 0)) { - var tmpEnforceId = obj.lawEnforcerIdTwo.split(','); - var tmpEnforceText = obj.lawEnforcerTwo.split(','); - var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); - data.lawCer = []; - for (var i = 0; i < tmpEnforceId.length; i++) { - lawCer.push({ - text: tmpEnforceText[i], - id: tmpEnforceId[i], - show: nameCorrect(lawEnforcer2Show[i]) - }); + obj.lawList = lawList; + + // 执法人员 + let lawCer = []; + obj.lawEnforcerIdTwo = dt.lawEnforcerIdTwo; + obj.lawEnforcerTwo = dt.lawEnforcerTwo; + var lawEnforcer2ShowStr = dt.lawEnforcer2Show; + if ((null != obj.lawEnforcerIdTwo && obj.lawEnforcerIdTwo.length > 0) + && (null != obj.lawEnforcerTwo && obj.lawEnforcerTwo.length > 0)) { + var tmpEnforceId = obj.lawEnforcerIdTwo.split(','); + var tmpEnforceText = obj.lawEnforcerTwo.split(','); + var lawEnforcer2Show = lawEnforcer2ShowStr.split(','); + data.lawCer = []; + for (var i = 0; i < tmpEnforceId.length; i++) { + lawCer.push({ + text: tmpEnforceText[i], + id: tmpEnforceId[i], + show: nameCorrect(lawEnforcer2Show[i]) + }); + } } + obj.lawCer = lawCer; + data.regList.push(obj); } - obj.lawCer = lawCer; - data.regList.push(obj); - } + res(); + }); } // 返回 @@ -1049,7 +1019,7 @@ } .van-hairline--top-bottom:after, .van-hairline-unset--top-bottom:after { - border: 0; + border: 0; }