From ad5ff3c59ac06315557a3c1f92da57c977127c8b Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 21 Jun 2024 15:41:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9=E6=8D=A2=E6=88=90100=E5=85=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/linkage.js | 2 ++ src/views/administrative/appointmentList.vue | 2 +- src/views/enforce/historyCheck.vue | 2 +- src/views/enforce/sign.vue | 2 +- src/views/enterprise/complaintList.vue | 2 +- src/views/enterprise/enterpriseInspectionList.vue | 2 +- src/views/enterprise/registrationList.vue | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/api/linkage.js b/src/api/linkage.js index 3225c5a..5486220 100644 --- a/src/api/linkage.js +++ b/src/api/linkage.js @@ -3,5 +3,7 @@ import { _get, _post,_form,_delete } from "../http/index"; export const queryLinkage = (params, success, error) => _post("/app/code/linkage/list",params,success,error) export const queryLinkageById = (params, success, error) => _post("/app/code/linkage/objById",params,success,error) export const queryLinkageDictByValueAndParentId = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueAndParentId",params,success,error) +export const queryLinkageDictByValueNoAuth = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueNoAuth",params,success,error) +export const queryLinkageDictByValue = (params, success, error) => _post("/app/code/linkage/queryLinkageDictByValue",params,success,error) export const queryZqyjjdm = (params, success, error) => _get("/app/zqyjjdm/list",params,success,error) diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index ab45779..e55907c 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -145,7 +145,7 @@ // 设置初始值为当前时间 onMounted(() => { - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 171a900..e1fd94e 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -145,7 +145,7 @@ data.dateSearch = nowDate(new Date()); - // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { // getLinkageByParentIdToItem(success.id) // },error=>{}); diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index a360bb9..ddd0a54 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -356,7 +356,7 @@ onMounted(() =>{ }) - getLinkageByValueAndParentId("law_item", "0"); + getLinkageByValueAndParentId("law_item", "100"); //初始化时间 submitData.enforcementTime = formattedTime(new Date()); }) diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue index 093373d..c22d260 100644 --- a/src/views/enterprise/complaintList.vue +++ b/src/views/enterprise/complaintList.vue @@ -140,7 +140,7 @@ onMounted(() => { searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); data.dateSearch = nowDate(new Date()); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) },error=>{}); }); diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue index 3049b23..f1e2d12 100644 --- a/src/views/enterprise/enterpriseInspectionList.vue +++ b/src/views/enterprise/enterpriseInspectionList.vue @@ -164,7 +164,7 @@ // getCard(); searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue index 1d6e730..a92dd0f 100644 --- a/src/views/enterprise/registrationList.vue +++ b/src/views/enterprise/registrationList.vue @@ -161,7 +161,7 @@ searchParam.enterpriseNumber = useCommon.enterpriseNumber; // queryList(); data.dateSearch = nowDate(new Date()); - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "0"}, success => { + queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); From 4c974c19bfed51d1e106cc92c1543400b4900d29 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 21 Jun 2024 16:04:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointmentList.vue | 4 +++- src/views/enforce/enforcementPlan.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index e55907c..b651863 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -451,6 +451,8 @@ flex-direction: row; align-items: end; position: relative; + height: 0.65rem; + margin: 3% 0 1%; .date-select { font-size: 0.52rem; @@ -463,7 +465,7 @@ .search-button { position: absolute; - top: 0.2rem; + top: 0; right: 3%; width: 15%; height: 0.6rem; diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue index 8ca852d..8c882aa 100644 --- a/src/views/enforce/enforcementPlan.vue +++ b/src/views/enforce/enforcementPlan.vue @@ -403,6 +403,8 @@ flex-direction: row; align-items: end; position: relative; + height: 0.65rem; + margin: 3% 0 1%; .date-select { font-size: 0.52rem; @@ -415,7 +417,7 @@ .search-button { position: absolute; - top: 0.2rem; + top: 0; right: 3%; width: 15%; height: 0.6rem; From ddaacc4ed8f446e4c06a35d417b91138196d5d38 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 21 Jun 2024 16:57:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E4=BA=8B=E9=A1=B9=E5=8A=A0=E4=B8=8A=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/linkage.js | 4 ++-- src/views/administrative/appointment.vue | 4 ++-- src/views/enforce/sign.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/linkage.js b/src/api/linkage.js index 5486220..fc96633 100644 --- a/src/api/linkage.js +++ b/src/api/linkage.js @@ -1,9 +1,9 @@ import { _get, _post,_form,_delete } from "../http/index"; -export const queryLinkage = (params, success, error) => _post("/app/code/linkage/list",params,success,error) +export const queryLinkage = (params, success, error) => _get("/app/code/linkage/listByParentId",params,success,error) export const queryLinkageById = (params, success, error) => _post("/app/code/linkage/objById",params,success,error) export const queryLinkageDictByValueAndParentId = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueAndParentId",params,success,error) +export const queryLinkageDictByValue = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValue",params,success,error) export const queryLinkageDictByValueNoAuth = (params, success, error) => _post("/app/code/linkage/selectLinkageDictByValueNoAuth",params,success,error) -export const queryLinkageDictByValue = (params, success, error) => _post("/app/code/linkage/queryLinkageDictByValue",params,success,error) export const queryZqyjjdm = (params, success, error) => _get("/app/zqyjjdm/list",params,success,error) diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 6345809..267e3e9 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -384,7 +384,7 @@ const getLinkageByValueAndParentId = (value, parentId) => { // 查询检查要求字典信息 - queryLinkageDictByValueAndParentId({"value": value, "parentId": parentId}, success => { + queryLinkageDictByValueAndParentId({"dataScopeId": useCommon.userId, "value": value, "parentId": parentId}, success => { getLinkageByParentIdToItem(success.id) }, error => { }); @@ -392,7 +392,7 @@ const getLinkageByParentIdToItem = (parentId) => { // 查询检查要求字典信息 - queryLinkage({"parentId": parentId}, success => { + queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => { for (var i = 0; i < success.length; i++) { data.item_columns.push({text: success[i].title, value: success[i].id, id: success[i].id}) // if (i==0) { diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index ddd0a54..fa0429b 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -290,14 +290,14 @@ const tapBad = () => { const getLinkageByValueAndParentId = (value, parentId) => { // 查询检查要求字典信息 - queryLinkageDictByValueAndParentId({"value":value, "parentId": parentId}, success => { + queryLinkageDictByValueAndParentId({"dataScopeId": useCommon.userId, "value":value, "parentId": parentId}, success => { getLinkageByParentIdToItem(success.id) },error=>{}); } const getLinkageByParentIdToItem = (parentId) => { // 查询检查要求字典信息 - queryLinkage({"parentId": parentId}, success => { + queryLinkage({"dataScopeId": useCommon.userId, "parentId": parentId}, success => { for(var i=0; i Date: Tue, 25 Jun 2024 09:29:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=99=BB=E8=AE=B0=20?= =?UTF-8?q?=E7=9A=84=E6=89=A7=E6=B3=95=E4=BA=8B=E9=A1=B9=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=A3=80=E6=9F=A5=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/sign.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index fa0429b..bfc2487 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -63,7 +63,7 @@ required readonly label="检查事项" - placeholder="执法事项" + placeholder="检查事项" @click="data.showItem = true" type="textarea" rows="1" @@ -76,7 +76,7 @@ readonly :rules="[{ required: true, message: '必填项' }]" label="检查依据" - placeholder="执法依据" + placeholder="检查依据" @click="showPopupqz" type="textarea" rows="1" @@ -356,7 +356,8 @@ onMounted(() =>{ }) - getLinkageByValueAndParentId("law_item", "100"); + // getLinkageByValueAndParentId("law_item", "100"); + getLinkageByValueAndParentId("check_item", "100"); //初始化时间 submitData.enforcementTime = formattedTime(new Date()); }) From 1a9ae8f342e81d3d7458736e9ad83a7b0ce6a366 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 25 Jun 2024 11:13:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=A7=E6=B3=95=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=99=BB=E8=AE=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/administrative/appointmentList.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index b651863..182f2b5 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -78,6 +78,10 @@

企业名称： {{ item.enterpriseName }}

+
+

状态： 未登记

+

状态： 已登记

+