From e745f26016b28c700927d0b2dd3fd6f22d8d8c8a Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Sun, 15 Sep 2024 03:41:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterprise/enterpriseInspectionNotice.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue
index 3cc3b05..6c82fb5 100644
--- a/src/views/enterprise/enterpriseInspectionNotice.vue
+++ b/src/views/enterprise/enterpriseInspectionNotice.vue
@@ -33,9 +33,9 @@
         </van-tabs>
 
         <!-- 底部 -->
-        <div class="shop_footer_body">
+<!--        <div class="shop_footer_body">
             <footer-nav></footer-nav>
-        </div>
+        </div>-->
     </div>
 </template>
 

From 7ead033333a260fa8217efaeaa74c4e5ab80efc8 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 15 Sep 2024 03:52:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8D=E6=89=AB=E7=A0=81=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointmentList.vue |  3 +++
 src/views/enforce/sign.vue                   | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 0180748..9ccb18e 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -131,6 +131,8 @@
     })
 
 
+    //路由参数
+    const route = useRoute();
     const router = useRouter();
     let allchecked = ref(false); // 是否全选
     let refreshLoad = ref(false); // 是否加载中
@@ -435,6 +437,7 @@
         data.showIsCancel = false;
         return;
       }else{
+          console.log("=====> route?.query?.id : ", route?.query?.id)
         cancelEnterpriseLawEnforcement(route?.query?.id,success =>{
           router.go(-1);
         });
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index e6e0fb2..8f71b2a 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -131,12 +131,12 @@
                                 readonly
 
                         /> -->
-                        <van-field v-model="submitData.enforceReason"
+<!--                        <van-field v-model="submitData.enforceReason"-->
+<!--                                   label="原&nbsp; &nbsp; &nbsp; &nbsp;因"-->
+<!--                        />-->
+                        <van-field
+                                   v-model="submitData.reason"
                                    label="原&nbsp; &nbsp; &nbsp; &nbsp;因"
-                        />
-                        <van-field v-if="submitData.checkCss == 3"
-                                   v-model="submitData.enforceReason"
-                                   label="补录原因"
                                    rows="2"
                                    autosize
                                    type="textarea"
@@ -489,7 +489,8 @@
     onMounted(() => {
         nameCorrect();
         submitData.enterpriseNumber = route?.query?.enterpriseNumber;
-        submitData.enforce = route?.query?.reason;
+        // submitData.enforce = route?.query?.reason;
+        submitData.reason = route?.query?.reason;
         submitData.checkCss = route?.query?.checkCss;
         data.isNoScan = route?.query?.isNoScan;
 

From bad61d4fe5424abcc4bf1e418111ba098e929994 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Sun, 15 Sep 2024 03:59:57 +0800
Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/analyse.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue
index b2b560e..97495c8 100644
--- a/src/views/common/analyse.vue
+++ b/src/views/common/analyse.vue
@@ -18,7 +18,7 @@
             </div>
 
             <div class="analybox">
-                <div class="title">执法类别</div>
+                <div class="title">检查类别</div>
                 <div id="echartRing" class="chartbox"></div>
                 <div id="echartLine" class="chartbox"></div>
             </div>

From cdd912a87c66a005b07507be652c8d8d53795406 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 15 Sep 2024 04:01:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/sign.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 8f71b2a..44d295e 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -256,6 +256,9 @@
             <van-picker :columns="data.checkCategorys" @cancel="data.showCheckCategoryPicker = false" @confirm="onConfirmCheckCategory" />
         </van-popup>
 
+        <popupcp :visible="data.popupCp" :content="data.popupCpContent" @close="closePopup"
+                 @reciveData="reciveDataCp"/>
+
       <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
                  @reciveData="reciveDept"/>
 
@@ -285,6 +288,7 @@
     import LawPopup from './lawFilter.vue';
     import PopupA from './assistUserFilter.vue';
     import Popupzq from './zqyjjdmFilter.vue';
+    import popupcp from '../enterprise/companyFilter.vue';
     import {getDict} from "../../api/Home";
     import {queryLinkage, queryLinkageDictByValueAndParentId} from "../../api/linkage";
     import {
@@ -922,6 +926,7 @@
         data.popupVisible = false;
         data.popupVisible2 = false;
         data.popupVisibleqz = false;
+        data.popupCp = false;
         data.lawChecked = false;
         data.deptChecked = false;
     }