From 8467f3c7a843b001934c28e585e6f429ff6ae032 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Fri, 2 Aug 2024 19:32:30 +0800
Subject: [PATCH 1/9] =?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/enterprise/complaintDetail.vue | 14 +++++++++++++-
src/views/enterprise/complaintList.vue | 18 +++++++++---------
src/views/enterprise/complaintNoScan.vue | 8 ++++++--
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue
index ccdb2b5..c927023 100644
--- a/src/views/enterprise/complaintDetail.vue
+++ b/src/views/enterprise/complaintDetail.vue
@@ -150,7 +150,7 @@
{{item.deptName}}{{item.userName}}
+联合检查部门、人员
{{item.deptName}}{{item.userName}}
@@ -585,6 +586,17 @@ overflow: hidden; background-color: #ebf3fb; } + + .warp_body { + margin: 0 3%; + padding-bottom: 3rem; + width: 94%; + height: 100%; + background-color: #ebf3fb; + overflow-y: auto; + margin-top: 0.15rem; + } + /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ .van-popup.van-toast{ background: var(--van-toast-background) !important; @@ -630,16 +642,17 @@ } .add-inspect { - margin: 0 0.425rem 0 3.06rem; - padding-bottom: 0.3rem; - font-size: 0.35rem; - color: #323233; + margin: 0 0.425rem; + padding-bottom: 0.3rem; + min-height: 2rem; + font-size: 0.37rem; + color: #323233; } .add-inspect p { - margin: 0.1rem 0; - padding: 0.2rem 0; - //border-bottom: 1px solid #f4f5f6; + margin: 0.1rem 0; + padding: 0.2rem 0.1rem; + //border-bottom: 1px solid #f4f5f6; } .add-inspect p:nth-child(even) { diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 974d44b..3a1329b 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -5,7 +5,7 @@联合检查部门、人员
{{item.deptName}}{{item.userName}}
@@ -637,6 +638,17 @@ overflow: hidden; background-color: #ebf3fb; } + + .warp_body { + margin: 0 3%; + padding-bottom: 3rem; + width: 94%; + height: 100%; + background-color: #ebf3fb; + overflow-y: auto; + margin-top: 0.15rem; + } + /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ .van-popup.van-toast{ background: var(--van-toast-background) !important; @@ -682,16 +694,17 @@ } .add-inspect { - margin: 0 0.425rem 0 3.06rem; - padding-bottom: 0.3rem; - font-size: 0.35rem; - color: #323233; + margin: 0 0.425rem; + padding-bottom: 0.3rem; + min-height: 2rem; + font-size: 0.37rem; + color: #323233; } .add-inspect p { - margin: 0.1rem 0; - padding: 0.2rem 0; - //border-bottom: 1px solid #f4f5f6; + margin: 0.1rem 0; + padding: 0.2rem 0.1rem; + //border-bottom: 1px solid #f4f5f6; } .add-inspect p:nth-child(even) { From 584b4edf358e4bce8111fd6387d7e0a93779ce6c Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 2 Aug 2024 20:36:43 +0800 Subject: [PATCH 4/9] =?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/appointmentDetail.vue | 6 +++++- src/views/administrative/appointmentEdit.vue | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue index ecaf330..2bfc5e5 100644 --- a/src/views/administrative/appointmentDetail.vue +++ b/src/views/administrative/appointmentDetail.vue @@ -82,7 +82,7 @@ show-word-limit />联合检查部门、人员
+{{item.deptName}}{{item.userName}}
@@ -668,4 +668,8 @@ color: #323233; } + .add-inspect label { + margin-left: -0.1rem; + } + diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 3a1329b..e4ac2a2 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -142,18 +142,18 @@联合检查部门、人员
+{{item.deptName}}{{item.userName}}
{{item.deptName}}{{item.userName}}
@@ -375,7 +375,7 @@ } //查询当前登录人员信息 - if (submitData.isSubmit == 0) { + // if (submitData.isSubmit == 0) { queryUserInfo(useCommon.userId,success =>{ console.log("queryUserInfo : ", success.data) submitData.lawEnforcer = success.data.userName; @@ -386,7 +386,7 @@ submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; },error=>{}); - } + // } } },error=>{ console.log("保存失败") diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index e4ac2a2..aadcaa4 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -142,7 +142,7 @@{{item.deptName}}{{item.userName}}
@@ -427,7 +427,7 @@ } //查询当前登录人员信息 - if (submitData.isSubmit == 0) { + // if (submitData.isSubmit == 0) { queryUserInfo(useCommon.userId,success =>{ console.log("queryUserInfo : ", success.data) submitData.lawEnforcer = success.data.userName; @@ -438,7 +438,7 @@ submitData.lawEnforcement = success.data.dept.deptName; submitData.lawEnforcementId = success.data.dept.deptId; },error=>{}); - } + // } } },error=>{ console.log("保存失败") diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index d8d5929..4e8acd5 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -147,12 +147,12 @@ // 设置初始值为当前时间 onMounted(() => { - queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { - getLinkageByParentIdToItem(success.id) - }, error => { - }); + // queryLinkageDictByValueAndParentId({"value": "check_item", "parentId": "100"}, success => { + // getLinkageByParentIdToItem(success.id) + // }, error => { + // }); - // queryList(); + queryList(); data.dateSearch = nowDate(new Date()); isLodding.value = false; }); From e14abf167ba97c284db58b5fddfa4a0b4523f5e8 Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 2 Aug 2024 21:09:19 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterprise/complaintDetail.vue | 4 +++- src/views/enterprise/complaintDetailView.vue | 4 +++- src/views/enterprise/registrationDetail.vue | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue index c927023..db84fcf 100644 --- a/src/views/enterprise/complaintDetail.vue +++ b/src/views/enterprise/complaintDetail.vue @@ -572,7 +572,9 @@ img { width: 1.92rem; height: 2rem; - padding-right: 0.27rem; + /* padding-right: 0.27rem; */ + margin: 0 0.21rem 0.21rem 0; + font-size: 0.35rem; } } diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 6475431..315d33b 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -500,7 +500,9 @@ img { width: 1.92rem; height: 2rem; - padding-right: 0.27rem; + /* padding-right: 0.27rem; */ + margin: 0 0.21rem 0.21rem 0; + font-size: 0.35rem; } } diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 4351485..574fd89 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -481,7 +481,9 @@ const reciveData2 = (item) =>{ img { width: 1.92rem; height: 2rem; - padding-right: 0.27rem; + /* padding-right: 0.27rem; */ + margin: 0 0.21rem 0.21rem 0; + font-size: 0.35rem; } } From 337106bde9a13db0516969d45ab35699098f165a Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 2 Aug 2024 21:35:27 +0800 Subject: [PATCH 7/9] =?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/enterprise/complaintDetail.vue | 3 +-- src/views/enterprise/complaintDetailView.vue | 3 +-- src/views/enterprise/registrationDetail.vue | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue index db84fcf..dfd7f72 100644 --- a/src/views/enterprise/complaintDetail.vue +++ b/src/views/enterprise/complaintDetail.vue @@ -535,8 +535,7 @@ .file-upload-center { position: absolute; width: 90%; - height: 20%; - top: 10%; + height: 0.65rem; left: 0.43rem; font-size: 0.38rem; diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 315d33b..92f944f 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -463,8 +463,7 @@ .file-upload-center { position: absolute; width: 90%; - height: 20%; - top: 10%; + height: 0.65rem; left: 0.43rem; font-size: 0.38rem; diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 574fd89..dacfed5 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -447,8 +447,7 @@ const reciveData2 = (item) =>{ .file-upload-center { position: absolute; width: 90%; - height: 20%; - top: 10%; + height: 0.65rem; left: 0.43rem; font-size: 0.38rem; span { From cd47884f59e93046681d589cb8256f14c08f2e7d Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Fri, 2 Aug 2024 22:00:30 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enforcementPlanAdd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 1bae5c6..2776d09 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -102,9 +102,9 @@ />执法时间:{{ item.createTime }}
-