From 9b81aff7d80c41b327aabe3b71a3bf341c7e47da Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Fri, 6 Sep 2024 12:46:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A1=8C=E6=94=BF=E6=A3=80=E6=9F=A5=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92tab=E9=A1=B5=202.bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer-enforcement-nav/index.vue          |   2 +-
 src/router/enforceHome.js                     |   6 +-
 src/views/administrative/appointment.vue      |  15 +-
 src/views/administrative/appointmentBase.vue  |   2 +-
 src/views/administrative/appointmentList.vue  |  10 +-
 src/views/enforce/enforceNotice.vue           |   7 +-
 src/views/enforce/enforcementPlan.vue         |   6 +-
 src/views/enforce/enforcementPlanAdd.vue      |  14 +-
 src/views/enforce/enforcementPlanBase.vue     | 199 ++++++++++++++++++
 .../compaint/registrationListView.vue         |  25 +++
 src/views/enterprise/complaint.vue            |  11 +-
 src/views/enterprise/complaintList.vue        |  23 +-
 src/views/enterprise/registrationList.vue     |   2 +-
 13 files changed, 288 insertions(+), 34 deletions(-)
 create mode 100644 src/views/enforce/enforcementPlanBase.vue

diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index 5fdfe02..dd89a71 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -16,7 +16,7 @@
 				name="Shop"
 				replace
 				icon="records"
-				to="/enforce/enforcementPlan"
+				to="/enforce/enforcementPlanBase"
 				>计划</van-tabbar-item
 			>
 			<van-tabbar-item
diff --git a/src/router/enforceHome.js b/src/router/enforceHome.js
index 40a439f..932c39e 100644
--- a/src/router/enforceHome.js
+++ b/src/router/enforceHome.js
@@ -58,9 +58,9 @@ const routes = [
 	// },
   //公布执法计划页面
 	{
-		path: "/enforce/enforcementPlan",
-		name: "enforcementPlan",
-		component: () => import("@/views/enforce/enforcementPlan.vue"),
+		path: "/enforce/enforcementPlanBase",
+		name: "enforcementPlanBase",
+		component: () => import("@/views/enforce/enforcementPlanBase.vue"),
 		meta: {
 			isKeepAlive: false
 		},
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 148b6e7..e095d89 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -275,6 +275,10 @@
                 <div class="block"><van-loading size="100" type="spinner" color="#1989fa" /></div>
             </div>
         </van-overlay>
+      <!-- 底部 -->
+      <div class="shop_footer_body">
+        <footer-enforcement-nav></footer-enforcement-nav>
+      </div>
     </div>
 </template>
 
@@ -779,6 +783,10 @@
       margin-top: 0.15rem;
     }
 
+    .van-cell-group {
+      padding: 0.3rem 0;
+    }
+
     /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
     .van-popup.van-toast {
         background: var(--van-toast-background) !important;
@@ -807,7 +815,12 @@
     }
 
     /deep/ .van-action-bar {
-      box-shadow: 0 0 0.27rem #e5e5e5;
+      position: relative;
+      top: 0.5rem;
+      /*box-shadow: 0 0 0.27rem #e5e5e5;/*/
+      background: transparent;
+      width: 100%;
+      float: right;
     }
 
     .divdsty {
diff --git a/src/views/administrative/appointmentBase.vue b/src/views/administrative/appointmentBase.vue
index 67f9b89..c825804 100644
--- a/src/views/administrative/appointmentBase.vue
+++ b/src/views/administrative/appointmentBase.vue
@@ -38,7 +38,7 @@
   </div>
 </template>
 
-<script setup name="complaintBase">
+<script setup name="appointmentBase">
     import appointmentList from '@/views/administrative/appointmentList.vue';
     import appointmentAdd from '@/views/administrative/appointment.vue';
 
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index cc652e7..9250a83 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -31,10 +31,10 @@
             <van-button plain hairline :class="9==data.checkNum?'search-button active':'search-button'" @click="selectDate" round type="primary" size="mini">筛选
             </van-button>
         </div>
-<!--        <div class="search-button-date">
+       <div class="search-button-date">
             <span class="date-select" v-show="data.dateShow" @click="selectDate">{{  data.dateSearch }}</span>
             <div class="van-hairline&#45;&#45;bottom"></div>
-            <van-button class="search-button" @click="goAdd" type="primary" size="mini">创建</van-button>
+            <!-- <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="选择日期"
@@ -46,7 +46,7 @@
                         @cancel="cancelSelectDate"
                 />
             </van-popup>
-        </div>-->
+        </div>
 
         <!-- 中间 -->
         <div class="shop-center">
@@ -520,8 +520,8 @@
         flex-direction: row;
         align-items: end;
         position: relative;
-        height: 0.65rem;
-        margin: 3% 0 1%;
+        /*height: 0.65rem;
+        margin: 3% 0 1%;*/
 
         .date-select {
             margin: 3% 0 0 4%;
diff --git a/src/views/enforce/enforceNotice.vue b/src/views/enforce/enforceNotice.vue
index fb7f5ed..836db5f 100644
--- a/src/views/enforce/enforceNotice.vue
+++ b/src/views/enforce/enforceNotice.vue
@@ -418,7 +418,7 @@
         display: flex;
         position: relative;
         margin: 1% 0;
-        padding: 0 1% 0 0;
+        padding: 1% 1% 3% 0;
         width: 98%;
         align-items: flex-start;
         /*border-bottom: 1px solid #f3f4f5;*/
@@ -426,7 +426,7 @@
 
     .notice-item > i {
         display: inline-block;
-        margin: 1% 0.1rem 0 0.2rem;
+        margin: 1% 0 0 0.2rem;
         width: 1.25rem;
         height: 1.25rem;
         background: url("../../assets/images/icon_notice2.png") no-repeat left top 50%;
@@ -436,7 +436,7 @@
     .item-cont {
         display: inline-block;
         margin: 3% 0 0 0;
-        width: calc(100% - 1.55rem);
+        width: calc(100% - 1.45rem);
     }
 
     .item-time {
@@ -466,7 +466,6 @@
         color: #666;
         font-size: 0.35rem;
         font-weight: normal;
-        line-height: 2;
     }
 
     .item-text a {
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index c21f27d..cd79d0c 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -41,7 +41,7 @@
         <div class="search-button-date">
             <span class="date-select" v-show="data.dateShow" @click="selectDate">{{  data.dateSearch }}</span>
             <div style="border-color: black;" class="van-hairline--bottom"></div>
-            <van-button class="search-button" type="primary" size="mini" @click="openPlanAddView">创建</van-button>
+<!--            <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="选择月度"
@@ -463,8 +463,8 @@
       flex-direction: row;
       align-items: end;
       position: relative;
-      height: 0.65rem;
-      margin: 3% 0 1%;
+      /*height: 0.65rem;
+      margin: 3% 0 1%;*/
 
       .date-select {
           margin: 3% 0 0 4%;
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 08ed1f7..09e9811 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -149,6 +149,11 @@
           </div>
         </div>
       </div>
+
+      <!-- 底部 -->
+      <div class="shop_footer_body">
+        <footer-enforcement-nav></footer-enforcement-nav>
+      </div>
     </div>
 </template>
 
@@ -421,7 +426,7 @@
     }
 
     .van-cell-group {
-      padding-bottom: 1rem;
+      padding: 0.3rem 0;
     }
 
     /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
@@ -500,7 +505,12 @@
     }
 
     /deep/ .van-action-bar {
-      box-shadow: 0 0 0.27rem #e5e5e5;
+      position: relative;
+      top: 0.5rem;
+      /*box-shadow: 0 0 0.27rem #e5e5e5;/*/
+      background: transparent;
+      width: 100%;
+      float: right;
     }
 
     :root {
diff --git a/src/views/enforce/enforcementPlanBase.vue b/src/views/enforce/enforcementPlanBase.vue
new file mode 100644
index 0000000..92f1a6c
--- /dev/null
+++ b/src/views/enforce/enforcementPlanBase.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="home app_content">
+    <!-- 中间 -->
+    <!--        <div class="warp_body">-->
+    <!--            <div class="white-body">-->
+    <!--                <div class="tabs">-->
+    <!--                    <ul>-->
+    <!--                        <li v-for='(item,index) in data.list' @click='check(index)'-->
+    <!--                            :class="{ active: index === data.TabId }">-->
+    <!--                            <span v-if="index === 0"> {{item.title}}</span>-->
+    <!--                            <span v-else-if="index === 1" class="warn-tab"> {{item.title}}</span>-->
+    <!--                        </li>-->
+    <!--                    </ul>-->
+    <!--                </div>-->
+    <!--                <div v-if="data.TabId == 0">-->
+    <!--                    <enterpriseInspectionList isReg="0"></enterpriseInspectionList>-->
+    <!--                </div>-->
+    <!--                <div v-if="data.TabId == 1">-->
+    <!--                    <enterpriseInspectionList isReg="1"></enterpriseInspectionList>-->
+    <!--                </div>-->
+    <!--            </div>-->
+    <!--        </div>-->
+
+    <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
+      <van-tab v-for="(item, index) in data.list" :title="item.title">
+        <div v-if="data.TabId == 0" style="height: calc(100vh - 1.2rem);">
+          <enforcementPlanAdd :isReg="0" />
+        </div>
+        <div v-if="data.TabId == 1" style="height: calc(100vh - 1.2rem);">
+          <enforcementPlanList :isReg="1" />
+        </div>
+      </van-tab>
+    </van-tabs>
+  </div>
+</template>
+
+<script setup name="enforcementPlanBase">
+import enforcementPlanAdd from '@/views/enforce/enforcementPlanAdd.vue';
+import enforcementPlanList from '@/views/enforce/enforcementPlan.vue';
+
+const {useCommon} = $globalStore;
+//路由参数
+const router = useRouter();
+const route = useRoute();
+
+//tab切换
+const active = ref(0);
+const data = reactive({
+  status: 0,
+  TabId: 0,
+  list: [
+    {
+      title: '创建检查计划',
+      value: '0'
+    },
+    {
+      title: '行政检查计划',
+      value: '1'
+    },
+  ],
+});
+
+const onClickTab = ({ title }) => {
+  if(title == '创建检查计划'){
+    data.TabId = 0;
+  }else{
+    data.TabId = 1;
+  }
+};
+
+
+onMounted(() => {
+
+})
+
+</script>
+
+<style lang="less" scoped>
+.home {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+  background-color: #ebf3fb;
+
+  .warp_body {
+    position: relative;
+    background-image: linear-gradient(to bottom, #ebf3fb, transparent);
+  }
+
+  .white-body {
+    margin: 0 3%;
+    width: 94%;
+    height: 99%;
+    background-color: #fff;
+    border-radius: 0.27rem;
+  }
+}
+
+.tohome {
+  position: absolute;
+  top: 1.25%;
+  right: 5%;
+  font-size: 0.5rem;
+}
+
+.tabs {
+  padding: 3% 3% 0;
+  width: 94%;
+  height: 1.25rem;
+  box-sizing: content-box;
+}
+
+.tabs ul {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  font-size: 0.4rem;
+  line-height: 1.25rem;
+  text-align: center;
+  align-content: center;
+  justify-items: center;
+}
+
+.tabs ul li {
+  float: left;
+  width: 50%;
+  height: 100%;
+}
+
+.tabs ul li span {
+  display: block;
+  width: 100%;
+  height: 100%;
+  color: #4aa1f9;
+  background: url("src/assets/images/tab_bg1_1.png") no-repeat;
+  background-size: 100% 100%;
+}
+
+.tabs ul li.active span {
+  background: url("src/assets/images/tab_bg1.png") no-repeat;
+  background-size: 100% 100%;
+  color: #fff;
+}
+
+.tabs ul li span.warn-tab {
+  margin-left: -2%;
+  background: url("src/assets/images/tab_bg.png") no-repeat;
+  background-size: 100% 100%;
+}
+
+.tabs ul li.active span.warn-tab {
+  background: url("src/assets/images/tab_bg_1.png") no-repeat;
+  background-size: 100% 100%;
+  color: #fff;
+}
+
+.tabs ul li span.level1 {
+  background: url("src/assets/images/tab_shine_red.gif") no-repeat !important;
+  background-size: 100% 100% !important;
+  color: #fff !important;
+}
+
+.tabs ul li span.level2 {
+  background: url("src/assets/images/tab_shine_org.gif") no-repeat !important;
+  background-size: 100% 100% !important;
+  color: #fff !important;
+}
+
+.tabs ul li span.level3 {
+  background: url("src/assets/images/tab_shine_yel.gif") no-repeat !important;
+  background-size: 100% 100% !important;
+  color: #fff !important;
+}
+
+.addinfo {
+  position: absolute;
+  bottom: 3%;
+  right: 2%;
+  z-index: 99999;
+  width: 1.5rem;
+  height: 1.5rem;
+  background-color: #1367fe;
+  border-radius: 50%;
+  box-shadow: 0 0 0.27rem #1367fe;
+  color: #fff;
+  font-size: 0.4rem;
+  text-align: center;
+  vertical-align: middle;
+  padding-top: 0.45rem;
+  box-sizing: border-box;
+}
+
+/deep/ .van-tabs__line {
+  width: 44%;
+  height: 0.06rem;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue
index 53f72fd..2b2b988 100644
--- a/src/views/enterprise/compaint/registrationListView.vue
+++ b/src/views/enterprise/compaint/registrationListView.vue
@@ -52,6 +52,10 @@
                           <div class="card_box">
                               <div class="card_box_span">
                                   <p>检查时间：{{ item.createTime }} <span class="card_box_action"></span></p>
+                                  <div class="act-btn">
+                                    <!--                                      <span class="card_box_action"></span>-->
+                                    <span class="joint-mark">联</span>
+                                  </div>
                               </div>
 
 
@@ -624,4 +628,25 @@
     color: #f50;
     font-size: 0.35rem;
   }
+
+  .act-btn {
+    display: flex;
+    position: absolute;
+    top: 0;
+    right: 0;
+    white-space: nowrap;
+  }
+
+  .joint-mark {
+    display: inline-block;
+    margin: 0 0.25rem 0 0;
+    width: 0.5rem;
+    height: 0.5rem;
+    background: #2d94fa;
+    border-radius: 50%;
+    color: #fff;
+    font-size: 0.3rem;
+    line-height: 1.75;
+    text-align: center;
+  }
 </style>
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 1a866d3..7d64198 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -108,10 +108,10 @@
                                 label="投诉事项"
                                 placeholder="请选择"
                                 readonly
-                                required
                                 :rules="[{ required: true, message: '请选择投诉事项' }]"
-                                clickable
-                                is-link
+                                rows="1"
+                                autosize
+                                type="textarea"
                         />
                     </view>
                     <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
@@ -824,4 +824,9 @@
       margin-left: -0.2rem;
     }
 
+    /deep/ .van-field textarea.van-field__control {
+      line-height: 1.5;
+    }
+
+
 </style>
diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue
index b814db3..263bc1c 100644
--- a/src/views/enterprise/complaintList.vue
+++ b/src/views/enterprise/complaintList.vue
@@ -30,11 +30,14 @@
           </van-button>
 
           <van-button plain hairline :class="0==data.checkNum?'search-button active':'search-button'"
-                      @click="searchDateType(0)" round type="primary" size="mini">受理中
+                      @click="searchDateType(0)" round type="primary" size="mini">已受理
           </van-button>
 
           <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'"
-                      @click="searchDateType(1)" round type="primary" size="mini">已受理
+                      @click="searchDateType(1)" round type="primary" size="mini">处理中
+          </van-button>
+          <van-button plain hairline :class="2==data.checkNum?'search-button active':'search-button'"
+                      @click="searchDateType(2)" round type="primary" size="mini">已办结
           </van-button>
           <!--  <van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">已处理</van-button>-->
           <!--      <van-button plain hairline class="search-button" @click="mssq()" round type="primary" size="mini">临时按钮</van-button>-->
@@ -67,8 +70,8 @@
                                   <div class="card_box_span">
                                       <p>投诉时间：{{ item.createTime }} <span class="card_box_action">
                   </span></p>
-                                      <span class="state-text" v-if="item.status == 0">处理中</span>
-                                      <span class="state-text" v-if="item.status >= 1">已处理</span>
+                                      <span class="state-text" v-if="item.status == 0">已受理</span>
+                                      <span class="state-text" v-if="item.status >= 1">处理中</span>
                                       <span class="state-text" v-if="item.status >= 2">已办结</span>
                                   </div>
 
@@ -613,9 +616,9 @@
   }
 
   .goods_box .item-todo {
-      background-image: linear-gradient(45deg, #fbeaea, transparent);
+      /*background-image: linear-gradient(45deg, #fbeaea, transparent);
       border-left: 0.12rem solid #e50505;
-      border-radius: 0.27rem;
+      border-radius: 0.27rem;*/
 
       .state-text {
           color: #e50505;
@@ -623,9 +626,9 @@
   }
 
   .goods_box .item-doing {
-      background-image: linear-gradient(45deg, #eafbf3, transparent);
+      /*background-image: linear-gradient(45deg, #eafbf3, transparent);
       border-left: 0.12rem solid #04a920;
-      border-radius: 0.27rem;
+      border-radius: 0.27rem;*/
 
       .state-text {
           color: #03a159;
@@ -633,9 +636,9 @@
   }
 
   .goods_box .item-done {
-      background-image: none;
+      /*background-image: none;
       border-left: 0.12rem solid #999;
-      border-radius: 0.27rem;
+      border-radius: 0.27rem;*/
 
       .state-text {
           color: #999;
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 789615e..4cd7372 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -75,7 +75,7 @@
                                 <div class="card_box_span">
                                     <p>检查时间：{{ item.createTime }}</p>
                                     <div class="act-btn">
-                                      <span class="card_box_action"></span>
+<!--                                      <span class="card_box_action"></span>-->
                                       <span class="joint-mark">联</span>
                                     </div>
                                 </div>