Merge remote-tracking branch 'origin/v3' into v3

# Conflicts:
#	src/views/enforce/sign.vue

src/views/administrative/appointmentList.vue

@@ -135,6 +135,8 @@
     })
 
 
+    //路由参数
+    const route = useRoute();
     const router = useRouter();
     let allchecked = ref(false); // 是否全选
     let refreshLoad = ref(false); // 是否加载中
@@ -439,6 +441,7 @@
         data.showIsCancel = false;
         return;
       }else{
+          console.log("=====> route?.query?.id : ", route?.query?.id)
         cancelEnterpriseLawEnforcement(route?.query?.id,success =>{
           router.go(-1);
         });

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>

src/views/enforce/sign.vue

@@ -121,7 +121,7 @@
                     <!-- <div class="addbtn" @click.stop="addField"><van-icon name="add-o" /></div> -->
                   </div>
                     <van-field v-model="submitData.lawEnforcementBasis" v-show="false"/>
-                    <view v-if="data.isNoScan == 'true'">
+                    <view v-if="data.isNoScan">
                         <!-- <van-field
                                 v-model="submitData.enforce"
                     <view v-if="data.isNoScan == 'true'">
@@ -131,14 +131,12 @@
                                 readonly
 
                         /> -->
+<!--                        <van-field v-model="submitData.enforceReason"-->
+<!--                                   label="原&nbsp; &nbsp; &nbsp; &nbsp;因"-->
+<!--                        />-->
                         <van-field
-                        v-if="submitData.checkCss != 3"
-                          v-model="submitData.enforceReason"
-                                   label="原&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;因"
-                        />
-                        <van-field v-if="submitData.checkCss == 3"
-                                   v-model="submitData.enforceReason"
-                                   label="补录原因"
+                                   v-model="submitData.reason"
+                                   label="原&nbsp; &nbsp; &nbsp; &nbsp;因"
                                    rows="2"
                                    autosize
                                    type="textarea"
@@ -258,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"/>
 
@@ -287,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 {
@@ -491,7 +493,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;
 

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>