From e5b79bcf3aebdd2aa9f52ee237fe77083d170d21 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Sun, 2 Jun 2024 17:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E6=B8=85=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home.vue | 600 +++++----- src/views/enforce/enforcementPlanAdd.vue | 14 +- src/views/enforce/enterpriseBaseInfo.vue | 10 +- src/views/enforce/enterpriseScanPreview.vue | 3 +- src/views/enforce/historyCheck.vue | 898 ++++++++------- src/views/enforce/noScan.vue | 497 ++++---- src/views/enforce/sign.vue | 18 +- src/views/enterprise/caseFilter.vue | 852 +++++++------- src/views/enterprise/complaint.vue | 1153 ++++++++++--------- src/views/enterprise/complaintNoScan.vue | 14 +- src/views/enterprise/registrationEdit.vue | 12 +- src/views/enterprise/registrationList.vue | 39 +- 12 files changed, 2105 insertions(+), 2005 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index fc2d880..3ff0ada 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,311 +1,323 @@ diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index ec3fd71..1c54b22 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -81,7 +81,7 @@
文件上传 (不多于9张)
- + @@ -234,18 +234,16 @@ const uploadFiles = (file) =>{ } const deleteFile = (file,index) =>{ - console.log(index); - data.fileListObj.filter((item, indexs) => { - if (index.index == indexs) { - data.fileListObj.splice(indexs, 1);//splice 删除 - } - }); + // data.fileListObj.filter((item, indexs) => { + // if (index.index == indexs) { + // data.fileListObj.splice(indexs, 1);//splice 删除 + // } + // }); submitData.fileList.filter((item, indexs) => { if (index.index == indexs) { submitData.fileList.splice(indexs, 1);//splice 删除 } }); - console.log(submitData.fileList); return true; } onMounted(() => { diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index 277824a..389059b 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -246,10 +246,16 @@ onMounted(() =>{ data.enterpriseInfo.enterpriseType = success.data.companyOrgType data.enterpriseInfo.enterpriseAddress = success.data.enterpriseAddress data.enterpriseInfo.legalPerson = success.data.legalPerson - data.enterpriseInfo.registeredCapital = success.data.registeredCapital +' (人民币/元)' + var amount = 0.00; + if (null != success.data.registeredCapital) { + amount = Number(success.data.registeredCapital).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); + } + data.enterpriseInfo.registeredCapital = amount +' (人民币/元)' // data.enterpriseInfo.operatingTerm = success.data.operatingTerm var tmpoperatingTerm = success.data.operatingTerm; - tmpoperatingTerm = tmpoperatingTerm.substring(0, success.data.operatingTerm.indexOf('null')); + if (tmpoperatingTerm.indexOf('null') >= 0) { + tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')); + } data.enterpriseInfo.operatingTerm = tmpoperatingTerm; data.enterpriseInfo.businessScope = success.data.businessScope data.enterpriseInfo.establishmentTime = format(success.data.establishmentTime, 'yyyy-MM-dd'); diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index b2f0b03..6ff2b98 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -95,7 +95,8 @@ const toSign = () =>{ router.push({ path: "/sign", query:{ - enterpriseNumber: data.enterpriseNumber + enterpriseNumber: data.enterpriseNumber, + isNoScan: false } }); }; diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 041f04c..d8b7ffa 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -1,454 +1,474 @@ - diff --git a/src/views/enforce/noScan.vue b/src/views/enforce/noScan.vue index df6c6cc..28cfc35 100644 --- a/src/views/enforce/noScan.vue +++ b/src/views/enforce/noScan.vue @@ -1,271 +1,288 @@ \ No newline at end of file diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index f75375c..1bd32b7 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -44,7 +44,7 @@ @click="showPopup2" :rules="[{ required: true, message: '请选择辅助人员' }]" /> -
- (不多于9张) + (不多于3张)
- + @@ -206,6 +206,7 @@ const data = reactive({ lawEnforcementItemText: "", ga_columns: [], item_columns: [], + isNoScan: false, }); //保存参数 const submitData = reactive({ @@ -301,6 +302,7 @@ onMounted(() =>{ // 数据填充 // dataFillIn(); submitData.enforce = route?.query?.reason; + data.isNoScan = route?.query?.isNoScan; //查询企业信息 getEnterpriseInformation(route?.query?.enterpriseNumber,success =>{ @@ -349,11 +351,11 @@ const uploadFiles = (file) =>{ } const deleteFile = (file,index) =>{ - submitData.fileListObj.filter((item, indexs) => { - if (index.index == indexs) { - submitData.fileListObj.splice(indexs, 1);//splice 删除 - } - }); + // submitData.fileListObj.filter((item, indexs) => { + // if (index.index == indexs) { + // submitData.fileListObj.splice(indexs, 1);//splice 删除 + // } + // }); submitData.fileList.filter((item, indexs) => { if (index.index == indexs) { submitData.fileList.splice(indexs, 1);//splice 删除 diff --git a/src/views/enterprise/caseFilter.vue b/src/views/enterprise/caseFilter.vue index 86a5a0c..ce48e0f 100644 --- a/src/views/enterprise/caseFilter.vue +++ b/src/views/enterprise/caseFilter.vue @@ -1,429 +1,453 @@ \ No newline at end of file diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue index e5f4577..0dfc23c 100644 --- a/src/views/enterprise/complaint.vue +++ b/src/views/enterprise/complaint.vue @@ -1,580 +1,601 @@ diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue index 1726b02..6d21b5a 100644 --- a/src/views/enterprise/complaintNoScan.vue +++ b/src/views/enterprise/complaintNoScan.vue @@ -56,7 +56,7 @@
(不多于9张)
- + @@ -197,18 +197,16 @@ const uploadFiles = (file) =>{ } const deleteFile = (file,index) =>{ - console.log(index); - submitData.fileListObj.filter((item, indexs) => { - if (index.index == indexs) { - submitData.fileListObj.splice(indexs, 1);//splice 删除 - } - }); + // submitData.fileListObj.filter((item, indexs) => { + // if (index.index == indexs) { + // submitData.fileListObj.splice(indexs, 1);//splice 删除 + // } + // }); submitData.fileList.filter((item, indexs) => { if (index.index == indexs) { submitData.fileList.splice(indexs, 1);//splice 删除 } }); - console.log(submitData.fileList); return true; } onMounted(() => { diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index 4747610..1a5a6f4 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -98,7 +98,7 @@
(不多于9张)
- + @@ -332,11 +332,11 @@ } const deleteFile = (file,index) =>{ - submitData.fileListObj.filter((item, indexs) => { - if (index.index == indexs) { - submitData.fileListObj.splice(indexs, 1);//splice 删除 - } - }); + // submitData.fileListObj.filter((item, indexs) => { + // if (index.index == indexs) { + // submitData.fileListObj.splice(indexs, 1);//splice 删除 + // } + // }); submitData.fileList.filter((item, indexs) => { if (index.index == indexs) { submitData.fileList.splice(indexs, 1);//splice 删除 diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index 0c5bc64..6edc1c1 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -66,7 +66,7 @@

执法时间:{{ item.createTime }} - 投诉

@@ -97,7 +97,8 @@
- + @@ -213,17 +214,17 @@ * @param {*} id * @param {*} name */ - const toComplaintView = (id, name) => { + const toComplaintView = (id, name, text) => { console.log(id, name) - router.push( - { - path: "/enterprise/complaint", - query: { - id: id, - lawEnforcementIncident: name, - isSelect: false - } - }); + router.push({ + path: "/enterprise/complaint", + query: { + id: id, + lawEnforcementIncident: name, + lawEnforcementItemText: text, + isSelect: false + } + }); } /** * 查看执法登记详情 @@ -248,14 +249,14 @@ }); const countWorkdays = (startDate) => { - let workdays = 0; - endDate = new Date(); - for (let date = new Date(startDate); date <= endDate; date.setDate(date.getDate() + 1)) { - if (date.getDay() % 6 !== 0) { // 假设周末是6 (星期六) 和 0 (星期日) - workdays++; + let workdays = 0; + endDate = new Date(); + for (let date = new Date(startDate); date <= endDate; date.setDate(date.getDate() + 1)) { + if (date.getDay() % 6 !== 0) { // 假设周末是6 (星期六) 和 0 (星期日) + workdays++; + } } - } - return workdays; + return workdays; } // 返回