From d50553f93f0b4b8f65fc3088bbb8734555c54b6c Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Thu, 29 Aug 2024 20:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/footer-nav/index.vue           |   2 +-
 src/views/administrative/appointment.vue      |  49 ++++----
 src/views/enforce/enforcementPlanAdd.vue      | 115 +++++++++++++++---
 src/views/enforce/enterpriseWarningInfo.vue   |   2 +-
 .../enterprise/compaint/compaintBase.vue      |  14 ++-
 .../compaint/compaintDetailIndex.vue          |   4 +
 src/views/enterprise/complaintNoScan.vue      |   3 +-
 .../enterprise/enterpriseInspectionNotice.vue |  10 +-
 8 files changed, 144 insertions(+), 55 deletions(-)

diff --git a/src/components/footer-nav/index.vue b/src/components/footer-nav/index.vue
index 4073913..8b91523 100644
--- a/src/components/footer-nav/index.vue
+++ b/src/components/footer-nav/index.vue
@@ -5,7 +5,7 @@
 				$t("common.lang_home")
 			}}</van-tabbar-item>
 			<van-tabbar-item name="Classify" replace icon="bell" to="/enterprise/enterpriseInspectionNotice">
-				行政检查通知
+				行政检查预告
 			</van-tabbar-item>
 			<van-tabbar-item name="Classify" replace icon="todo-list" to="/enterprise/complaintList">
 				投诉进度查询
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 96884c5..5012e85 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -812,19 +812,14 @@
     }
 
     .addbtn {
-      margin: 3%;
-      padding: 0 0.35rem;
-      width: 94%;
-      font-size: 0.35rem;
-      color: #1367fe;
-      line-height: 1.5;
+      margin: 3% 0;
+      width: 100%;
       text-align: right;
-      box-sizing: border-box;
     }
 
     .addbtn i {
-      margin-right: -0.1rem;
-      font-size: 0.4rem;
+      font-size: 0.48rem;
+      color: #999;
     }
 
     .add-inspect {
@@ -884,33 +879,31 @@
       font-size: 0.35rem;
       color: #1367fe;
     }
-    .plan-attach {
-      display: flex;
-      align-items: center;
-      width: 100%;
-      white-space: nowrap;
-    }
-
-    .plan-time {
-      margin-left: 2.67rem;
-      width: 2.25rem;
-    }
 
     .flex-div {
       position: relative;
       display: flex;
-      margin: 0 0.43rem;
-      border-bottom: 1px solid #f5f6f7;
-      color: #323233;
+      align-items: flex-start;
+      padding: 0 0.43rem 0 0.23rem;
+      color: #666;
       font-size: 0.37rem;
+      white-space: nowrap;
     }
 
-    .flex-div::after {
+    .flex-div::before, .flex-div::after {
       position: absolute;
       bottom: 0;
       width: 100%;
       height: 1px;
-      border-bottom: 0.02667rem solid #fff;
+      border-bottom: 1px solid #fff;
+      content: "";
+    }
+
+    .flex-div::after {
+      left: 0.43rem;
+      bottom: 0;
+      width: calc(100% - 0.86rem);
+      border-bottom: 1px solid #f5f6f7;
       content: "";
     }
 
@@ -918,14 +911,14 @@
       float: right;
       margin-bottom: -1px;
       padding-right: 0;
-      width: 40%;
+      width: 38%;
       border-bottom: 1px solid #f5f6f7;
     }
 
     .flex-div .van-field:first-child {
       float: left;
-      padding-left: 0;
-      width: 60%;
+      padding-left: 0.2rem;
+      width: 62%;
     }
 
     /deep/ .van-picker-column__item--selected {
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index a2aa482..65634b5 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -34,26 +34,35 @@
                         />
                     </van-popup>
 
-                    <van-field
+<!--                    <van-field
                             v-model="submitData.planName"
                             label="计划名称"
                             placeholder="请输入"
                             required
                             :rules="[{ required: true, message: '请输入计划名称' }]"
+                    />-->
+                  <div class="flex-div">
+                    <van-field
+                        v-model="submitData.planName"
+                        label="计划名称"
+                        is-link
+                        placeholder="年份"
+                        required
                     />
-
-                      <div class="plan-attach">
-                        <div class="plan-time">
-                            <van-field
-                                    v-model="data.fieldValue"
-                                    is-link
-                                    readonly
-                                    placeholder="选择时段"
-                                    @click="data.dateShowPicker = true"
-                            />
-                        </div>
-                        <div class="plan-text">行政检查计划</div>
+                    <div class="right-txt">
+                        <span>年</span>
+                        <van-field
+                            v-model="data.fieldValue"
+                            is-link
+                            readonly
+                            @click="data.dateShowPicker = true"
+                        />
+                        <span>行政检查计划</span>
                     </div>
+                  </div>
+                  <div class="warning-rule">
+                    <span><van-icon name="warning-o" /></span><span>格式："执法部门"+"年份"+"年度/月度/季度"+行政检查计划</span>
+                  </div>
                     <van-popup v-model:show="data.dateShowPicker" round position="bottom">
                         <van-picker
                                 :columns="data.dateColumns"
@@ -101,7 +110,7 @@
                     />
                     <div class="file-upload">
                         <div class="file-upload-center">
-                            <label>文件上传</label> <span>(仅限PDF文档)</span>
+                            <label>文件上传</label> <span>(仅限PDF文档，50MB以下)</span>
                         </div>
                         <van-uploader v-model="data.fileListObj" max-count="1" class="file" :after-read="uploadFiles"
                                       multiple @oversize="onOversize" :before-delete="deleteFile" accept=".pdf">
@@ -110,6 +119,9 @@
                             </template>
                         </van-uploader>
                     </div>
+                  <div class="warning-rule">
+                    <span><van-icon name="warning-o" /></span>仅支持上传<b><i>50MB</i></b>以下的<b><i>PDF</i></b>格式文档<span></span>
+                  </div>
                 </van-cell-group>
                 <van-action-bar>
                     <van-button round block type="info" native-type="submit">提交</van-button>
@@ -395,6 +407,10 @@
       margin-top: 0.15rem;
     }
 
+    .van-cell-group {
+      padding-bottom: 1rem;
+    }
+
     /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
     // .van-popup.van-toast{
     //     background: var(--van-toast-background) !important;
@@ -478,7 +494,7 @@
         --van-dialog-width: 16rem;
     }
 
-    .plan-attach {
+    /*.plan-attach {
       display: flex;
       align-items: center;
       width: 100%;
@@ -495,7 +511,7 @@
       color: #666;
       font-size: 0.37rem;
       line-height: 3.25;
-    }
+    }*/
 
     .popcont {
       position: absolute;
@@ -558,4 +574,71 @@
       margin-left: -0.2rem;
     }
 
+    .warning-rule {
+      display: flex;
+      align-items: center;
+      margin: 2% 0.27rem 1%;
+      padding: 0.2rem;
+      border-radius: 0.27rem;
+      background-color: #fff4e8;
+      color: #fb710b;
+      font-size: 0.3rem;
+      line-height: 1.25;
+    }
+
+    .warning-rule i {
+      margin: 0 0.1rem;
+      color: #f50;
+      font-size: 0.35rem;
+    }
+
+    .flex-div {
+      position: relative;
+      display: flex;
+      align-items: center;
+      padding: 0 0.43rem 0 0.23rem;
+      color: #666;
+      font-size: 0.37rem;
+      white-space: nowrap;
+    }
+
+    .flex-div::before, .flex-div::after {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      height: 1px;
+      border-bottom: 1px solid #fff;
+      content: "";
+    }
+
+    .flex-div::after {
+      left: 0.43rem;
+      bottom: 0;
+      width: calc(100% - 0.86rem);
+      border-bottom: 1px solid #f5f6f7;
+      content: "";
+    }
+
+    .flex-div .van-field {
+      margin-bottom: -1px;
+      padding-right: 0;
+      border-bottom: 1px solid #f5f6f7;
+    }
+
+    .flex-div > .van-field {
+      float: left;
+      padding-left: 0;
+      width: 50%;
+    }
+
+    .right-txt {
+      display: flex;
+      align-items: center;
+      width: 50%;
+    }
+
+    /deep/ .flex-div .van-field__label--required:before {
+      margin-left: 0;
+    }
+
 </style>
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 5a3ea9f..da812f2 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -25,7 +25,7 @@
 		预警提醒（全市）
     </van-button>
     <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(0)" round type="primary"
-                size="mini">预警提醒（本部门）
+                size="mini">预警提醒（本单位）
     </van-button>
   </div>
   <div class="warning-rule">
diff --git a/src/views/enterprise/compaint/compaintBase.vue b/src/views/enterprise/compaint/compaintBase.vue
index ace4d90..9d5c8db 100644
--- a/src/views/enterprise/compaint/compaintBase.vue
+++ b/src/views/enterprise/compaint/compaintBase.vue
@@ -24,10 +24,10 @@
       <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.5rem);">
-                  <registrationListView isReg="0" />
+                  <complaintNoScan isReg="0" />
               </div>
               <div v-if="data.TabId == 1" style="height: calc(100vh - 1.5rem);">
-                  <complaintNoScan isReg="1" :isNoScan="true" />
+                  <registrationListView isReg="1" :isNoScan="true" />
               </div>
           </van-tab>
       </van-tabs>
@@ -51,18 +51,18 @@
         TabId: 0,
         list: [
             {
-                title: '检查事项投诉',
+                title: '入企不扫码投诉',
                 value: '0'
             },
             {
-                title: '入企不扫码投诉',
+                title: '检查事项投诉',
                 value: '1'
             },
         ],
     });
 
     const onClickTab = ({ title }) => {
-      if(title == '检查事项投诉'){
+      if(title == '入企不扫码投诉'){
         data.TabId = 0;
       }else{
         data.TabId = 1;
@@ -192,4 +192,8 @@
         box-sizing: border-box;
     }
 
+    /deep/ .van-tabs__line {
+      width: 2.5rem;
+    }
+
 </style>
\ No newline at end of file
diff --git a/src/views/enterprise/compaint/compaintDetailIndex.vue b/src/views/enterprise/compaint/compaintDetailIndex.vue
index 44ae162..ba5b882 100644
--- a/src/views/enterprise/compaint/compaintDetailIndex.vue
+++ b/src/views/enterprise/compaint/compaintDetailIndex.vue
@@ -212,4 +212,8 @@
         box-sizing: border-box;
     }
 
+    /deep/ .van-tabs__line {
+      width: 1.6rem;
+    }
+
 </style>
\ No newline at end of file
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 0385ced..1b02b36 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -26,6 +26,7 @@
                     <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" /> -->
                     <!-- @click="selectType" -->
                     <van-field
+                            v-if="isNoScan"
                             v-model="submitData.enforceTypeText"
                             label="投诉类型"
                             placeholder="请选择"
@@ -50,7 +51,7 @@
                         />
                     </div>
                   </div>
-                    <van-divider class="divdsty"/>
+<!--                    <van-divider class="divdsty"/>-->
                     <van-field
                             v-model="submitData.enforcementTime"
                             label="检查时间"
diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue
index 409a37b..72147cf 100644
--- a/src/views/enterprise/enterpriseInspectionNotice.vue
+++ b/src/views/enterprise/enterpriseInspectionNotice.vue
@@ -54,11 +54,11 @@
         TabId: 0,
         list: [
             {
-                title: '检查通知',
+                title: '实时检查预告',
                 value: '0'
             },
             {
-                title: '历史通知',
+                title: '历史检查预告',
                 value: '1'
             },
         ],
@@ -69,7 +69,7 @@
         data.TabId = index;
     };
     const onClickTab = ({ title }) => {
-      if(title == "检查通知"){
+      if(title == "实时检查预告"){
         data.TabId = 0;
       }else{
         data.TabId = 1;
@@ -199,4 +199,8 @@
         box-sizing: border-box;
     }
 
+    /deep/ .van-tabs__line {
+      width: 2.3rem;
+    }
+
 </style>