bug修改

src/views/administrative/appointmentDetail.vue

@@ -106,9 +106,9 @@
                       </p>
                   </div> -->
 
-                  <van-action-bar v-if="submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
+<!--                  <van-action-bar v-if="submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
                       <van-button round block type="info" native-type="submit" @click="data.showIsCancel = true">取消</van-button>
-                  </van-action-bar>
+                  </van-action-bar>-->
                 </van-cell-group>
             </van-form>
         </div>
@@ -791,6 +791,10 @@
       padding-bottom: 0.27rem;
     }
 
+    .van-overlay {
+      z-index: 999;
+    }
+
     .popcont {
       position: absolute;
       z-index: 100;

src/views/administrative/appointmentList.vue

@@ -86,8 +86,9 @@
                                         <p v-if="item.isReg == 1"><label class="card_box_label">执法状态：</label> <span>已登记</span></p>
                                     </div>
                                   <div class="btn-list" >
-                                    <a v-if="item.isReg != 1 && item.status != 1 && item.status != 3" @click.stop="toEditView(item.id)"><van-icon name="edit" />编辑</a>
+                                    <a v-if="item.isReg != 1 && item.status != 1 && item.status != 3" @click.stop="toEditView(item.id)"><van-icon name="edit" />变更</a>
-                                    <a  v-if="item.isReg == 1" @click.stop="relaunchView(item.id)"><van-icon name="edit" />再次发起</a>
+                                    <a v-if="item.isReg != 1 && item.status != 1" @click.stop="data.showIsCancel = true"><van-icon name="close" />取消</a>
+                                    <a  v-if="item.isReg == 1" @click.stop="relaunchView(item.id)"><van-icon name="passed" />再次发起</a>
                                   </div>
                                 </div>
                             </div>
@@ -101,6 +102,14 @@
         <div class="shop_footer_body">
             <footer-enforcement-nav></footer-enforcement-nav>
         </div>
+      <div class="van-overlay" v-show="data.showIsCancel">
+        <div class="popcont">
+          <div class="poptip">确认取消该行政检查通知？</div>
+          <div class="popup-btn">
+            <a @click="cancel(0)">取消</a><a @click="cancel(1)">确认</a>
+          </div>
+        </div>
+      </div>
     </div>
 </template>
 
@@ -172,6 +181,7 @@
             { text: '季度', value: 'quarter' },
             { text: '月度', value: 'month' },
         ],
+        showIsCancel: ref(false)
     });
 
     // 设置初始值为当前时间
@@ -420,6 +430,17 @@
             });
     }
 
+    const cancel = (val) => {
+      if(val == 0){
+        data.showIsCancel = false;
+        return;
+      }else{
+        cancelEnterpriseLawEnforcement(route?.query?.id,success =>{
+          router.go(-1);
+        });
+      }
+    };
+
 </script>
 
 <style lang="less" scoped>
@@ -624,5 +645,55 @@
       margin: 0 0.2rem;
     }
 
+    .van-overlay {
+      z-index: 999;
+    }
+
+    .popcont {
+      position: absolute;
+      z-index: 100;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      padding: 5% 3% 0;
+      width: 70%;
+      height: 4rem;
+      background: linear-gradient(to bottom, #d6e7f9, #fff);
+      border-radius: 0.35rem;
+    }
+
+    .poptip {
+      margin: 0.3rem;
+      min-height: 1.25rem;
+      font-size: 0.4rem;
+      font-weight: 600;
+      text-align: center;
+      //border-bottom: 1px solid #eee;
+    }
+
+    .popup-btn {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 2% auto 0;
+      width: 90%;
+      height: 1.5rem;
+    }
+
+    .popup-btn a {
+      width: 45%;
+      color: #333;
+      font-size: 0.37rem;
+      line-height: 2.5;
+      text-align: center;
+      border: 1px solid #ddd;
+      border-radius: 1rem;
+    }
+
+    .popup-btn a:last-child {
+      background-color: #1367fe;
+      color: #fff;
+      border-color: #1367fe;
+    }
 </style>
 

src/views/enforce/enforcementPlanAdd.vue

@@ -706,6 +706,10 @@
       line-height: 3.25;
     }*/
 
+    .van-overlay {
+      z-index: 999;
+    }
+
     .popcont {
       position: absolute;
       z-index: 100;

src/views/enforce/enterpriseBaseInfo.vue

@@ -651,7 +651,10 @@ export default {
         border-radius: 0.27rem;
 
         .swipe_cell {
+            margin: 0 0 1% 0;
             width: 100%;
+            box-shadow: 0 0 0.1rem #e7e7e7;
+            border-radius: 0.15rem;
         }
 
         .card_box {
@@ -670,7 +673,7 @@ export default {
             .card_box_span {
                 display: flex;
                 align-items: center;
-                margin: 2% 0;
+                margin: 1% 0;
                 padding: 0 3%;
                 color: #666;
                 font-size: 0.35rem;
@@ -738,7 +741,7 @@ export default {
     }
 
     .goods_box .swipe_cell .card_box .card_box_span p {
-        margin: 0.1rem 0;
+        margin: 0;
         color: #999;
     }
 

src/views/enforceHome.vue

@@ -1,7 +1,7 @@
 <template>
-   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+<!--   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
-   <div class="home app_content" v-if="!isLoading">
+   <div class="home app_content" v-if="!isLoading">-->
-    <!-- <div class="home app_content"> -->
+     <div class="home app_content">
         <!-- 导航栏 -->
         <!-- <div class="header_body">
                     <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>

src/views/enterprise/compaint/uniteDept.vue

@@ -20,7 +20,7 @@
                   <van-cell-group inset>
                       <van-cell v-for="(item, index) in deptList" :key="item">
                           <div style="display: flex; justify-content: space-between;">
-                              <div style="width: 70%;" @click="toggle(item.deptId)">
+                              <div @click="toggle(item.deptId)">
                                   <van-checkbox :name="item.deptId+';-;'+item.deptName" :ref="el => checkboxRefs[item.deptId] = el" @click.stop>
                                       {{item.deptName}}
                                   </van-checkbox>
@@ -204,9 +204,9 @@
   }
 
   .popup-content {
-      margin: 0.25rem 3% 0;
+      margin: 0.25rem 0;
       padding-bottom: 3rem;
-      width: 94%;
+      width: 100%;
       height: calc(100% - 1.6rem);
       overflow-y: auto;
       font-size: 0.37rem;
@@ -216,8 +216,8 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin: 3%;
+    padding: 1% 0.43rem 3%;
-    width: 94%;
+    width: calc(100% - 0.86rem);
     height: 1.25rem;
     font-size: 0.37rem;
   }

src/views/enterprise/complaintDetailView.vue

@@ -319,7 +319,7 @@
                 const element = depts[index];
                 if(index == 0 ){
                   var obj = {
-                    label:"执法部门",
+                    label:"投诉对象",
                     value: element
                   }
                   deptArr.value.push(obj)

src/views/enterprise/complaintNoScan.vue

@@ -58,7 +58,7 @@
                             placeholder="请选择"
                             is-link
                             required
-                            :rules="[{ required: true, message: '请选择执法时间' }]"
+                            :rules="[{ required: true, message: '请选择检查时间' }]"
                             @click="selectTime"/>
                             <van-popup v-model:show="data.showTimePicker" position="bottom" :style="{ height: '30%' }">
                             <van-date-picker

src/views/enterprise/enterpriseEvaluate/evaluate.vue

@@ -5,7 +5,7 @@
 <!--            <div class="cardsty"><label>处置单位</label><span>{{data.dataObj.orgText}}</span></div>-->
             <div class="cardsty">
                 <h4>您对我们的执法检查满意吗？</h4>
-                <div class="eval-item">
+<!--                <div class="eval-item">
                     <label>请评价</label>
                     <span class="eval-star">
                         <van-icon @click="checkDealSpeedMetrics(n)" class="active" name="star"
@@ -15,9 +15,21 @@
                     </span>
                     <span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 1">不满意</span>
                     <span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 2">较满意</span>
-                    <span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 3">满意</span>
+                    <span class="eval-star-font" v-if="data.dataObj.dealSpeedMetrics == 3">满意</span>-->
                     <!-- <span v-if="data.dataObj.dealSpeedMetrics == 4">满意</span>
                     <span v-if="data.dataObj.dealSpeedMetrics == 5">非常满意</span> -->
+<!--                </div>-->
+
+              <div class="eval-list">
+                <div id="evalBad">
+                  <span></span><label>不满意</label>
+                </div>
+                <div id="evalGood">
+                  <span></span><label>较满意</label>
+                </div>
+                <div id="evalVeryGood" class="active">
+                  <span></span><label>满意</label>
+                </div>
               </div>
                 <!-- <div class="eval-item">
                     <label>检查效果</label>
@@ -388,4 +400,68 @@
       box-shadow: 0 0 0.27rem #e5e5e5;
     }
 
+    .eval-list {
+      display: flex;
+      justify-content: space-between;
+      margin: 3%;
+    }
+
+    .eval-list > div {
+      width: 30%;
+      text-align: center;
+    }
+
+    .eval-list > div > label {
+      margin: 0.2rem 0;
+      color: #999;
+    }
+
+    .eval-list > div.active > label {
+      color: #323233;
+      font-weight: 600;
+    }
+
+    .eval-list > div > span {
+      display: block;
+      margin: 0.5rem auto 0.2rem;
+      width: 0.8rem;
+      height: 1.0rem;
+    }
+
+    .eval-list > div#evalBad > span {
+      background: url("../../../assets/images/eval-bad-dis.png") no-repeat;
+      background-size: 100%;
+      opacity: .5;
+    }
+
+    .eval-list > div#evalGood > span {
+      background: url("../../../assets/images/eval-good-dis.png") no-repeat;
+      background-size: 100%;
+      opacity: .5;
+    }
+
+    .eval-list > div#evalVeryGood > span {
+      background: url("../../../assets/images/eval-verygood-dis.png") no-repeat;
+      background-size: 100%;
+      opacity: .5;
+    }
+
+    .eval-list > div#evalBad.active > span {
+      background: url("../../../assets/images/eval-bad.png") no-repeat;
+      background-size: 100%;
+      opacity: 1;
+    }
+
+    .eval-list > div#evalGood.active > span {
+      background: url("../../../assets/images/eval-good.png") no-repeat;
+      background-size: 100%;
+      opacity: 1;
+    }
+
+    .eval-list > div#evalVeryGood.active > span {
+      background: url("../../../assets/images/eval-verygood.png") no-repeat;
+      background-size: 100%;
+      opacity: 1;
+    }
+
 </style>

src/views/enterprise/enterpriseInspectionList.vue

@@ -109,9 +109,9 @@
         </div>
 
         <!-- 底部 -->
-<!--        <div class="shop_footer_body">-->
+        <div class="shop_footer_body">
-<!--            <footer-nav></footer-nav>-->
+            <footer-nav></footer-nav>
-<!--        </div>-->
+        </div>
     </div>
 </template>
 

src/views/enterprise/enterpriseInspectionNotice.vue

@@ -103,6 +103,11 @@
             background-color: #fff;
             border-radius: 0.27rem;
         }
+
+      .shop_footer_body {
+        //height: 101px;
+        position: relative;
+      }
     }
 
     .tohome {