From 8e1f9ba6736d83376fbe5060b633f045fbd40f32 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 27 May 2025 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=89=A7=E6=B3=95,=20?= =?UTF-8?q?=E5=92=8C=20=E6=A3=80=E6=9F=A5=E6=AC=A1=E6=95=B0=20=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enforce.js | 2 +- src/views/enforce/earlyWarning.vue | 41 +++++++++++---------- src/views/enforce/enterpriseWarningInfo.vue | 5 ++- src/views/enforce/historyCheck.vue | 3 +- src/views/enforce/sign.vue | 32 +++++++++------- src/views/enforceHome.vue | 10 +++-- 6 files changed, 53 insertions(+), 40 deletions(-) diff --git a/src/api/enforce.js b/src/api/enforce.js index dc93240..fa22624 100644 --- a/src/api/enforce.js +++ b/src/api/enforce.js @@ -182,4 +182,4 @@ export const whole = (params,success,error) =>_get("/app/appComprehensiveAnalysi * @param {*} error * @returns */ -export const queryUnionByHour = (enterpriseNumber, success, error) => _get("/app/code/registration/queryUnionByHour/"+enterpriseNumber, null,success,error) \ No newline at end of file +export const queryUnionByHour = (enterpriseNumber, reason, success, error) => _get("/app/code/registration/queryUnionByHour/"+enterpriseNumber+"/"+reason, null,success,error) \ No newline at end of file diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue index 5c16b49..8359979 100644 --- a/src/views/enforce/earlyWarning.vue +++ b/src/views/enforce/earlyWarning.vue @@ -91,7 +91,7 @@
- 由于企业过多,请输入关键字搜索。 + 请输入关键字搜索。
@@ -129,8 +129,9 @@
-
{{ t.lawEnforcementItemText }}
-
{{ t.createTime }}
+ +
{{ t.createTime }}
+
{{ t.lawEnforcement }}
@@ -248,23 +249,25 @@ } searchParam.pageNum = (data.curPage-1)*searchParam.pageSize; - queryRegistrationListNew(searchParam, success => { - data.curPage++; - data.loading = false; // 查4出结果停止加载 - if (success.total <= data.dataList.length) { - // 查到最后没数据 - data.finished = ref(true); - // searchParam.numLeft = null; - // searchParam.numRight = null; - // searchParam.beginTime = null; - // searchParam.endTime =null; - return; - } - // data.dataList = success.data; - data.dataList.push(...success.rows); - }, error => { + if (null!=searchParam && searchParam.length>0) { + queryRegistrationListNew(searchParam, success => { + data.curPage++; + data.loading = false; // 查4出结果停止加载 + if (success.total <= data.dataList.length) { + // 查到最后没数据 + data.finished = ref(true); + // searchParam.numLeft = null; + // searchParam.numRight = null; + // searchParam.beginTime = null; + // searchParam.endTime =null; + return; + } + // data.dataList = success.data; + data.dataList.push(...success.rows); + }, error => { - }) + }) + } } const onSearch = (val) => { diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue index 2c99819..674d920 100644 --- a/src/views/enforce/enterpriseWarningInfo.vue +++ b/src/views/enforce/enterpriseWarningInfo.vue @@ -35,8 +35,9 @@
-
{{ t.lawEnforcementItemText }}
-
{{ t.createTime }}
+ +
{{ t.createTime }}
+
{{ t.lawEnforcement }}
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 1432e31..755964c 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -60,7 +60,8 @@

检查时间：{{ formattedTimeYYYYmmdd(item.enforcementTime) }}

未扫码 - 联 + + 联
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 21f7cf5..fd8e06e 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -153,13 +153,17 @@ - + -
+
@@ -169,12 +173,12 @@
-

以上皆不是

+

开启新的联合检查

- + @@ -374,7 +378,7 @@ deptChecked: false, deptContent: '', allNo: 'circle', - union_checked: false, // 联合检查选择 + union_checked: '0', // 联合检查选择 auth_checked: false, // 委托执法选择 union_datas: [], // 联合检查用的分组list check_union_no: '', // 选中的联合检查编号 @@ -563,7 +567,9 @@ submitData.enterpriseName = success.data.enterpriseName submitData.enterpriseNumber = success.data.enterpriseNumber // 查询是否有关联的执法记录 - getUnionByHour(submitData.enterpriseNumber); + if (null != submitData.enterpriseName) { + getUnionByHour(submitData.enterpriseNumber, submitData.checkCss); + } } }, error => { @@ -617,10 +623,9 @@ data.showBl = true; }) - const getUnionByHour = (enterpriseNumber) => { - data.union_datas = - console.log('----------> start : getUnionByHour: '+ enterpriseNumber) - queryUnionByHour(enterpriseNumber, success => { + const getUnionByHour = (enterpriseNumber, checkCss) => { + // data.union_datas = + queryUnionByHour(enterpriseNumber, checkCss, success => { if(success.success) { data.union_datas = success.data; } @@ -798,7 +803,7 @@ submitData.isUnite = 0; // if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了. //联合检查 - if (data.union_checked) {submitData.isUnite = 1;} + if (data.union_checked == 1) {submitData.isUnite = 1;} // 是否委托检查 if (data.auth_checked) {submitData.hasAuto = 1;} @@ -855,7 +860,7 @@ submitData.isUnite = 0; // if (data.checked) { submitData.isUnite = 1; } // 原来的联合检查, 忘记咋用了, 就没用了. //联合检查 - if (data.union_checked) {submitData.hasUnion = 1;} + if (data.union_checked == 1) {submitData.hasUnion = 1;} // 是否委托检查 if (data.auth_checked) {submitData.hasAuto = 1;} @@ -1050,6 +1055,7 @@ const reciveDataCp = (item) => { submitData.enterpriseName = item.enterpriseName; submitData.enterpriseNumber = item.enterpriseNumber; + getUnionByHour(submitData.enterpriseNumber, submitData.checkCss); // 填充数据 // dataFillIn('bulu'); } diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index d603307..74fd149 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -1,7 +1,7 @@