From 0365db6574eca9f0e663d012f09f8dc1c2b63b4a Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Fri, 30 Aug 2024 16:14:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=B8=8D=E6=89=AB=E7=A0=81=E6=8A=95?=
 =?UTF-8?q?=E8=AF=89=E5=86=85=E5=AE=B9=202.=20=E8=AE=A1=E5=88=92=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue | 16 ++---
 src/views/enforce/enforcementPlanAdd.vue | 74 ++++++++++++++----------
 src/views/enterprise/complaintNoScan.vue |  4 +-
 3 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 5012e85..5a8f290 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -890,16 +890,8 @@
       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 {
+      position: absolute;
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
@@ -907,12 +899,14 @@
       content: "";
     }
 
+    .flex-div .van-cell::after {
+      border-bottom: 0;
+    }
+
     .flex-div .van-field {
       float: right;
-      margin-bottom: -1px;
       padding-right: 0;
       width: 38%;
-      border-bottom: 1px solid #f5f6f7;
     }
 
     .flex-div .van-field:first-child {
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 65634b5..488ec7a 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -43,25 +43,36 @@
                     />-->
                   <div class="flex-div">
                     <van-field
-                        v-model="submitData.planName"
                         label="计划名称"
+                        v-model="submitData.planYear"
                         is-link
-                        placeholder="年份"
+                        placeholder="选择年份"
                         required
                     />
                     <div class="right-txt">
-                        <span>年</span>
-                        <van-field
-                            v-model="data.fieldValue"
-                            is-link
-                            readonly
-                            @click="data.dateShowPicker = true"
-                        />
-                        <span>行政检查计划</span>
+                      <van-field
+                          v-model="submitData.planTime"
+                          placeholder="请输入季度/月度"
+                      />
+                    </div>
+                  </div>
+                  <div class="flex-div">
+                    <van-field
+                        label=" "
+                        v-model="data.fieldValue"
+                        is-link
+                        readonly
+                        @click="data.dateShowPicker = true"
+                    />
+                    <div class="right-txt">
+                      <van-field
+                          v-model="submitData.planName"
+                          placeholder="行政检查计划"
+                      />
                     </div>
                   </div>
                   <div class="warning-rule">
-                    <span><van-icon name="warning-o" /></span><span>格式："执法部门"+"年份"+"年度/月度/季度"+行政检查计划</span>
+                    <span><van-icon name="warning-o" /></span><span>"执法部门"+"年份"+"年度/月度/季度"+行政检查计划</span>
                   </div>
                     <van-popup v-model:show="data.dateShowPicker" round position="bottom">
                         <van-picker
@@ -584,6 +595,7 @@
       color: #fb710b;
       font-size: 0.3rem;
       line-height: 1.25;
+      clear: both;
     }
 
     .warning-rule i {
@@ -596,22 +608,16 @@
       position: relative;
       display: flex;
       align-items: center;
+      justify-content: right;
+      margin-top: -1px;
       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 {
+      position: absolute;
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
@@ -619,24 +625,34 @@
       content: "";
     }
 
-    .flex-div .van-field {
-      margin-bottom: -1px;
-      padding-right: 0;
-      border-bottom: 1px solid #f5f6f7;
+    .flex-div:first-child::after {
+      border-bottom: 0;
+    }
+
+    .flex-div .van-cell::after {
+      border-bottom: 0;
     }
 
     .flex-div > .van-field {
-      float: left;
       padding-left: 0;
-      width: 50%;
+      padding-right: 0;
+      width: 55%;
     }
 
     .right-txt {
-      display: flex;
-      align-items: center;
-      width: 50%;
+      width: 45%;
     }
 
+    /deep/ .right-txt > .van-field {
+      float: right;
+      padding-right: 0;
+    }
+
+    /*/deep/ .flex-div:first-child .right-txt > .van-field .van-field__control {
+      text-align: right;
+      padding-right: 20%;
+    }*/
+
     /deep/ .flex-div .van-field__label--required:before {
       margin-left: 0;
     }
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 1b02b36..d92d249 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -85,6 +85,8 @@
                     <van-field
                         label="投诉内容"
                         required
+                        readonly
+                        placeholder="入企不扫码"
                     />
                     <van-field class="complaint-cont"
                                v-model="submitData.problemDescription"
@@ -93,7 +95,7 @@
                                type="textarea"
                                maxlength="100"
                                show-word-limit
-                               placeholder="请输入投诉内容"
+                               placeholder="请输入补充投诉内容"
                                :rules="[{ required: true, message: '请输入投诉内容' }]"
                     />