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

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

src/views/administrative/appointmentDetail.vue

@@ -27,12 +27,7 @@
                         label="检查时间"
                         :rules="[{ required: true, message: '必填项' }]"
                 />
-                <van-field
-                    v-model="submitData.lawEnforcement"
-                    readonly
-                    label="执法部门"
-                    :rules="[{ required: true, message: '必填项' }]"
-                />
+
                 <van-field
                         v-model="submitData.checkItemText"
                         label="检查事项"
@@ -51,7 +46,12 @@
                         type="textarea"
                         show-word-limit
                 />
-
+                <van-field
+                        v-model="submitData.lawEnforcement"
+                        readonly
+                        label="执法部门"
+                        :rules="[{ required: true, message: '必填项' }]"
+                />
                 <van-field
                         v-model="submitData.lawEnforcerText"
                         readonly

src/views/administrative/appointmentList.vue

@@ -4,7 +4,7 @@
        <!--  <div class="header_body">
             <header-nav :leftArrow="false" titelText="行政检查预约"/>
         </div>-->
-        <van-search v-model="searchParam.searchValue" show-action placeholder="执法事项/执法部门/企业名称 " @search="onSearch">
+        <van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/企业名称 " @search="onSearch">
             <template #action>
                 <div @click="onClickButton">搜索</div>
             </template>
@@ -31,7 +31,7 @@
             <van-button class="search-button" @click="goAdd" type="primary" size="mini">创建</van-button>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"

src/views/administrative/userFilter.vue

@@ -1,14 +1,14 @@
 <template>
     <div v-if="visible" class="van-overlay"></div>
     <div v-if="visible" class="popup">
-        <div class="popup-title">用户查询</div>
+        <div class="popup-title">人员查询</div>
         <!-- 关闭按钮 -->
         <label class="close-button" @click="closePopup"></label>
 
         <!-- 弹窗的内容 -->
         <div class="popup-content">
             <div class="subsearch">
-                <input class="searchbox" v-model="searchParam.userName" placeholder="请输入用户名/执法证件号搜索"/>
+                <input class="searchbox" v-model="searchParam.userName" placeholder="请输入姓名/执法证件号搜索"/>
                 <van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置"/>
                 <button class='btn-search' @click="search()">搜索</button>
             </div>

src/views/enforce/assistUserFilter.vue

@@ -1,14 +1,14 @@
 <template>
   <div v-if="visible" class="van-overlay"></div>
   <div v-if="visible" class="popup">
-    <div class="popup-title">用户查询</div>
+    <div class="popup-title">人员查询</div>
     <!-- 关闭按钮 -->
     <label class="close-button" @click="closePopup"></label>
 
     <!-- 弹窗的内容 -->
     <div class="popup-content">
         <div class="subsearch">
-          <input class="searchbox" v-model="searchParam.userName" placeholder="请输入用户名/执法证件号搜索" />
+          <input class="searchbox" v-model="searchParam.userName" placeholder="请输入姓名/执法证件号搜索" />
           <van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置" />
           <button class='btn-search' @click="queryList()">搜索</button>
         </div>

src/views/enforce/earlyWarning.vue

@@ -38,7 +38,7 @@
             <div style="border-color: black;" class="van-hairline--bottom"></div>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"

src/views/enforce/enforcementPlan.vue

@@ -43,7 +43,7 @@
             <van-button class="search-button" type="primary" size="mini" @click="openPlanAddView">创建</van-button>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"

src/views/enforce/historyCheck.vue

@@ -5,18 +5,9 @@
            <header-nav :slefBack="true" @goBack="goBack" :titelText="`行政检查信息查询`"/>
           <header-nav :slefBack="true" @goBack="goBack" :titelText="`历史检查信息`"/>
        </div> -->
-        <van-search 
-            v-model="searchParam.searchValue"
-            show-action 
-            placeholder="执法事项/执法部门/执法人员/企业名称"
-            clearable="true"
-            clear-icon="clear"
-            clear-trigger="always"
-            @search="onSearch">
-            <template #action>
-                <div @click="onClickButton">搜索</div>
-            </template>
-        </van-search>
+        <van-search v-model="searchParam.searchValue" show-action placeholder="检查事项/执法部门/执法人员/企业名称 " @search="onSearch">
+        <van-search
+
         <div class="search-button-list">
             <van-button plain hairline :class="null==data.checkNum?'search-button active':'search-button'"
                         @click="searchDateType(null)" round type="primary" size="mini">
@@ -43,7 +34,7 @@
             <div style="border-color: black;" class="van-hairline--bottom"></div>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"

src/views/enforce/lawFilter.vue

@@ -20,8 +20,8 @@
                     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
                         <div class="case-item" v-for="(item, index) in dataList" :key="index" >
                           <span class="selectButton" @click="selectData(item)">一键关联</span>
-                        <div class="case-title">执法事项：{{ item.checkItemText }}</div>
-                        <div class="case-time">执法时间：{{ item.checkTime }}</div>
+                        <div class="case-title">{{ item.checkItemText }}</div>
+                        <div class="case-time">检查时间：{{ item.checkTime }}</div>
 
                     </div>
                     </van-list>
@@ -292,14 +292,14 @@
     }
     .selectButton {
       position: absolute;
-      width: 20%;
-      height: 34%;
-      top: 30%;
-      right: 1%;
-      background-color: #1367fe;
-      color: #fff;
+      bottom: 10%;
+      right: 0;
+      padding: 0.05rem 0.15rem 0;
+      background-color: #d9e7f9;
+      color: #0140f9;
+      font-size: 0.3rem;
       text-align: center;
-      border-radius: 0.1rem;
+      border-radius: 0.15rem;
     }
 
 

src/views/enforce/sign.vue

@@ -54,6 +54,7 @@
                             required
                             :rules="[{ required: true, message: '请加载执法人员' }]"
                     />
+                  <div class="add-box">
                     <div v-for="(item, index) in data.lawCer" :key="index">
                         <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
                             {{index+1}}</label> <a>删除</a></div>
@@ -62,14 +63,14 @@
                                 label="执法人员"
                                 readonly
                                 required
+                                is-link
                                 :rules="[{ required: true, message: '必填项' }]"
                                 placeholder="请选择"
-                                is-link
                                 @click="showPopup(index)"
                         />
                     </div>
                     <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>
-
+                  </div>
                     <van-field
                             v-model="submitData.checkCategoryText"
                             label="检查类别"
@@ -91,6 +92,7 @@
                             show-word-limit
                     />
                     <van-field v-model="submitData.lawEnforcementItem" v-show="false"/>
+                  <div class="add-box">
                     <div v-for="(item, index) in data.lawList" :key="index">
                         <div class="item-delete" @click.stop="cancelEnforcement(index)"><label>检查依据 {{index+1}}</label>
                             <a>删除</a></div>
@@ -106,6 +108,7 @@
                         />
                     </div>
                     <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'">
                         <van-field
@@ -1070,6 +1073,10 @@
         box-shadow: 0 0 0.27rem #e5e5e5;
     }
 
+    .add-box {
+      position: relative;
+    }
+
     .addbtn {
       margin: 3%;
       padding: 0 0.35rem;

src/views/enforce/userFilter.vue

@@ -1,14 +1,14 @@
 <template>
     <div v-if="visible" class="van-overlay"></div>
     <div v-if="visible" class="popup">
-        <div class="popup-title">用户查询</div>
+        <div class="popup-title">人员查询</div>
         <!-- 关闭按钮 -->
         <label class="close-button" @click="closePopup"></label>
 
         <!-- 弹窗的内容 -->
         <div class="popup-content">
             <div class="subsearch">
-                <input class="searchbox" v-model="searchParam.userName" placeholder="请输入用户名/执法证件号搜索"/>
+                <input class="searchbox" v-model="searchParam.userName" placeholder="请输入姓名/执法证件号搜索"/>
                 <van-icon class="ibtn-reset" name="clear" @click="cancel()" title="重置"/>
                 <button class='btn-search' @click="search()">搜索</button>
             </div>

src/views/enterprise/compaint/registrationListView.vue

@@ -30,7 +30,7 @@
           <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
           <van-popup v-model:show="data.showDatePicker" position="bottom">
               <van-date-picker
-                      title="选择日期"
+                      title="选择月度"
                       v-model="data.currentDate"
                       :min-date="data.minDate"
                       :max-date="data.maxDate"

src/views/enterprise/enterpriseInspectionList.vue

@@ -54,7 +54,7 @@
             <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"
@@ -73,7 +73,7 @@
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
-                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}  
+                                        <p>检查时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
                                           <span v-if="item.checkTimeOrder == 1" >
                                              &nbsp;上午 9:00~12:00
                                           </span>

src/views/enterprise/registrationList.vue

@@ -53,7 +53,7 @@
             <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
             <van-popup v-model:show="data.showDatePicker" position="bottom">
                 <van-date-picker
-                        title="选择日期"
+                        title="选择月度"
                         v-model="data.currentDate"
                         :min-date="data.minDate"
                         :max-date="data.maxDate"

src/views/enterprise/registrationSelectList.vue

@@ -35,7 +35,7 @@
       <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
       <van-popup v-model:show="data.showDatePicker" position="bottom">
         <van-date-picker
-          title="选择日期"
+          title="选择月度"
           v-model="data.currentDate"
           :min-date="data.minDate"
           :max-date="data.maxDate"