From 075df1d0ede7c783f5d4c82936fbc2ee8e5518d5 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Sat, 24 Aug 2024 16:50:01 +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

---
 .../administrative/appointmentDetail.vue      | 14 +++----
 src/views/administrative/appointmentList.vue  | 22 +++++++----
 src/views/enforce/earlyWarning.vue            |  1 +
 src/views/enforce/enforcementPlan.vue         |  1 +
 src/views/enforce/enterpriseWarningInfo.vue   |  1 +
 src/views/enforce/historyCheck.vue            |  3 +-
 .../enterprise/compaint/compaintFlowView.vue  |  3 +-
 .../compaint/registrationListView.vue         |  3 +-
 src/views/enterprise/complaint.vue            | 14 +++----
 src/views/enterprise/complaintDetailView.vue  | 21 ++++++-----
 src/views/enterprise/complaintList.vue        |  1 +
 src/views/enterprise/complaintNoScan.vue      |  2 +-
 .../enterprise/enterpriseInspectionDetail.vue | 37 ++++++++++---------
 .../enterprise/enterpriseInspectionList.vue   | 19 ++++++----
 src/views/enterprise/register.vue             |  2 +
 src/views/enterprise/registrationDetail.vue   | 27 ++++++++++----
 src/views/enterprise/registrationList.vue     |  3 +-
 17 files changed, 105 insertions(+), 69 deletions(-)

diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index de511f5..3f6937c 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -27,7 +27,12 @@
                         label="检查时间"
                         :rules="[{ required: true, message: '必填项' }]"
                 />
-
+                <van-field
+                    v-model="submitData.lawEnforcement"
+                    readonly
+                    label="执法部门"
+                    :rules="[{ required: true, message: '必填项' }]"
+                />
                 <van-field
                         v-model="submitData.checkItemText"
                         label="检查事项"
@@ -46,12 +51,7 @@
                         type="textarea"
                         show-word-limit
                 />
-                <van-field
-                        v-model="submitData.lawEnforcement"
-                        readonly
-                        label="执法部门"
-                        :rules="[{ required: true, message: '必填项' }]"
-                />
+
                 <van-field
                         v-model="submitData.lawEnforcerText"
                         readonly
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index c8373c7..8f0b96c 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -51,19 +51,20 @@
                             <!--								<div class="card_box" @click="toDetailView(item.id)">-->
                             <div class="card_box">
                                 <div class="card_box_span">
-                                    <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
-    <!--                                            <span class="card_box_action" v-if="item.isSubmit == 0">-->
-    <!--                                            <span class="card_box_action" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
-                                            <van-button @click="toEditView(item.id)" type="primary"
-                                                        size="mini">编辑</van-button>
-                                        </span>-->
-                                    </p>
+                                  <p>检查时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
+                                    <span class="times" v-if="item.checkTimeOrder == 1" >
+                                            上午 9:00~12:00
+                                          </span>
+                                    <span class="times" v-if="item.checkTimeOrder == 2">
+                                            下午 14:00~17:00
+                                          </span>
+                                  </p>
                                 </div>
                                 <div @click="toDetailView(item.id)">
                                     <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
                                     <div class="van-hairline--bottom"></div>
                                     <div class="card_box_span card-title">
-                                        <p>{{ item.checkItem }}</p>
+                                        <p>{{ item.checkItemText }}</p>
                                     </div>
                                     <!-- <div class="card_box_span">
                                         <p><span class="card_box_label">登记编号：</span> {{ item.lawEnforcementCode }}</p>
@@ -537,6 +538,7 @@
     }
 
     .card-title p {
+      display: block !important;
       color: #000;
       font-size: 0.40rem;
       font-weight: bold;
@@ -589,5 +591,9 @@
       font-size: 0.4rem;
     }
 
+    .times {
+      margin: 0 0.2rem;
+    }
+
 </style>
 
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index d47aabe..8dfc32d 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -465,6 +465,7 @@
     }
 
     .card-title p {
+        display: block !important;
         width: calc(100% - 1rem);
         color: #000;
         font-size: 0.40rem;
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 9fc7df5..6b82849 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -489,6 +489,7 @@
     }
 
     .card-title p {
+      display: block !important;
       color: #000;
       font-size: 0.40rem;
       font-weight: bold;
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index 0b2ae7a..194eab3 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -466,6 +466,7 @@
   }
 
   .card-title p {
+    display: block !important;
     width: calc(100% - 1rem);
     color: #000;
     font-size: 0.40rem;
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 9bb278d..b03a95c 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -56,7 +56,7 @@
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
-                                        <p>执法时间：{{ item.enforcementTime }}
+                                        <p>检查时间：{{ item.enforcementTime }}
                                             <span v-if="null != item.enforce" class="remsty">未扫码</span>
                                         </p>
                                     </div>
@@ -573,6 +573,7 @@
     }
 
     .card-title p {
+      display: block !important;
         color: #000;
         font-size: 0.40rem;
         font-weight: bold;
diff --git a/src/views/enterprise/compaint/compaintFlowView.vue b/src/views/enterprise/compaint/compaintFlowView.vue
index 5d7a685..913044b 100644
--- a/src/views/enterprise/compaint/compaintFlowView.vue
+++ b/src/views/enterprise/compaint/compaintFlowView.vue
@@ -48,7 +48,7 @@
   margin: 0 3%;
   padding-bottom: 1rem;
   width: 94%;
-  height: 100%;
+  height: calc(100% - 1.15rem);
   background-color: #fff;
   overflow-y: auto;
   margin-top: 0.15rem;
@@ -79,6 +79,7 @@
   width: 96%;
   height: 94%;
   font-size: 0.37rem;
+  box-sizing: border-box;
 }
 
 .timitem {
diff --git a/src/views/enterprise/compaint/registrationListView.vue b/src/views/enterprise/compaint/registrationListView.vue
index f7bcd11..260e2ae 100644
--- a/src/views/enterprise/compaint/registrationListView.vue
+++ b/src/views/enterprise/compaint/registrationListView.vue
@@ -48,7 +48,7 @@
                       <van-swipe-cell class="swipe_cell">
                           <div class="card_box">
                               <div class="card_box_span">
-                                  <p>执法时间：{{ item.createTime }} <span class="card_box_action"></span></p>
+                                  <p>检查时间：{{ item.createTime }} <span class="card_box_action"></span></p>
                               </div>
 
 
@@ -551,6 +551,7 @@
   }
 
   .card-title p {
+    display: block !important;
     color: #000;
     font-size: 0.40rem;
     font-weight: bold;
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 3b9fd39..2b77764 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -489,13 +489,13 @@
     }
 
     .warp_body {
-        margin: 2% 3%;
-        padding-bottom: 3rem;
-        width: 94%;
-        height: 100%;
-        //border-radius: 0.25rem;
-        background-image: linear-gradient(to bottom, #ebf3fb, #fff);
-        overflow-y: auto;
+      margin: 0 3%;
+      padding-bottom: 1rem;
+      width: 94%;
+      height: calc(100% - 1.15rem);
+      background-color: #fff;
+      overflow-y: auto;
+      margin-top: 0.15rem;
     }
 
     /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index de778a2..aaa6ace 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -427,13 +427,13 @@
   }
 
   .warp_body {
-      margin: 2% 3%;
-      padding-bottom: 3rem;
-      width: 94%;
-      height: 100%;
-      //border-radius: 0.25rem;
-      background-image: linear-gradient(to bottom, #ebf3fb, #fff);
-      overflow-y: auto;
+    margin: 0 3%;
+    padding-bottom: 1rem;
+    width: 94%;
+    height: calc(100% - 1.15rem);
+    background-color: #fff;
+    overflow-y: auto;
+    margin-top: 0.15rem;
   }
 
   /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
@@ -756,12 +756,13 @@
     color: #666;
   }
   .complaint-cont {
-    margin: -1px 4% 2%;
+    margin: -1px 3% 2%;
+    padding: 0 0.15rem 0.5rem;
     width: 92%;
-    border-radius: 0.2rem;
-    border: 0.02667rem solid #eee;
+    border-radius: 0.15rem;
     box-sizing: border-box;
     line-height: 1.5;
+    font-size: 0.37rem;
   }
 
 </style>
diff --git a/src/views/enterprise/complaintList.vue b/src/views/enterprise/complaintList.vue
index 5762695..b1b2e28 100644
--- a/src/views/enterprise/complaintList.vue
+++ b/src/views/enterprise/complaintList.vue
@@ -556,6 +556,7 @@
   }
 
   .card-title p {
+    display: block !important;
     color: #000;
     font-size: 0.40rem;
     font-weight: bold;
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 1216258..02abb77 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -44,7 +44,7 @@
                     <van-divider class="divdsty"/>
                     <van-field
                             v-model="submitData.complaintTime"
-                            label="执法时间"
+                            label="检查时间"
                             placeholder="请选择"
                             is-link
                             required
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 439025f..6e56ee1 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -9,31 +9,32 @@
 <!--            <van-cell-group>-->
         <van-form @failed="onFailed" @submit="submit">
             <van-field
-                    v-model="submitData.checkTime"
-                    readonly
-                    label="检查时间"
+                v-model="submitData.checkTime"
+                readonly
+                label="检查时间"
             />
             <van-field
-                    v-model="submitData.checkItem"
-                    label="检查事项"
-                    rows="2"
-                    readonly
-                    type="textarea"
-                    show-word-limit
+                v-model="submitData.bureauDeptName"
+                readonly
+                label="执法部门"
             />
             <van-field
-                    v-model="submitData.checkRequire"
-                    label="检查要求"
-                    rows="2"
-                    readonly
-                    type="textarea"
-                    show-word-limit
+                v-model="submitData.checkItem"
+                label="检查事项"
+                rows="2"
+                readonly
+                type="textarea"
+                show-word-limit
             />
             <van-field
-                    v-model="submitData.bureauDeptName"
-                    readonly
-                    label="执法部门"
+                v-model="submitData.checkRequire"
+                label="检查要求"
+                rows="2"
+                readonly
+                type="textarea"
+                show-word-limit
             />
+
 <!--            <van-field-->
 <!--              v-model="submitData.enterpriseName"-->
 <!--              label="企业名称"-->
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index 9b3a3c2..2316486 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -70,11 +70,11 @@
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
-                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}  
-                                          <span v-if="item.checkTimeOrder == 1" >
+                                        <p>检查时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
+                                          <span class="times" v-if="item.checkTimeOrder == 1" >
                                             上午 9:00~12:00
                                           </span>
-                                          <span v-if="item.checkTimeOrder == 2">
+                                          <span class="times" v-if="item.checkTimeOrder == 2">
                                             下午 14:00~17:00
                                           </span>
                                         </p>
@@ -83,7 +83,7 @@
                                     <div @click="toDetailView(item.id)">
                                         <div class="van-hairline--bottom"></div>
                                         <div class="card_box_span card-title">
-                                            <p>{{ item.checkItem }}</p>
+                                            <p>{{ item.checkItemText }}</p>
                                         </div>
 
                                         <!-- <div class="card_box_span">
@@ -91,11 +91,11 @@
                                         </div> -->
                                         <div class="card_box_span">
 <!--                                            <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}</p>-->
-                                            <p><span class="card_box_label">检查事项：</span> {{ item.checkItemText }}</p>
+                                            <p><span class="card_box_label">检查部门：</span> {{ item.bureauDeptName }}</p>
                                         </div>
-                                        <div class="card_box_span">
+<!--                                        <div class="card_box_span">
                                             <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
-                                        </div>
+                                        </div>-->
                                     </div>
                                 </div>
                             </van-swipe-cell>
@@ -537,6 +537,7 @@
     }
 
     .card-title p {
+        display: block !important;
         color: #000;
         font-size: 0.40rem;
         font-weight: bold;
@@ -567,4 +568,8 @@
         text-align: center;
         line-height: 0.9rem;
     }
+
+    .times {
+      margin: 0 0.2rem;
+    }
 </style>
diff --git a/src/views/enterprise/register.vue b/src/views/enterprise/register.vue
index af31c1e..8d1c336 100644
--- a/src/views/enterprise/register.vue
+++ b/src/views/enterprise/register.vue
@@ -65,11 +65,13 @@
           v-model="submitData.legalPerson"
           label="法定代表人"
           placeholder="选填 法定代表人姓名"
+          readonly
         />
         <van-field
           v-model="submitData.registeredCapital"
           label="注册资本"
           placeholder="选填 注册资本"
+          readonly
         />
         <van-field
           v-model="submitData.establishmentTime"
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index 3a0d1fd..14ab4a8 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -124,14 +124,17 @@
                 <van-cell-group>
                     <div class="qy-name">评价</div>
                     <van-field
-                            v-model="submitData.evaluateDescription"
-                            label="意见|建议"
-                            rows="2"
-                            autosize
-                            readonly
-                            type="textarea"
-                            show-word-limit
+                      label="意见|建议"
+                      readonly
                     />
+                  <van-field class="complaint-cont"
+                      v-model="submitData.evaluateDescription"
+                      rows="5"
+                      autosize
+                      readonly
+                      type="textarea"
+                      show-word-limit
+                  />
 <!--                    <div v-if="submitData.authorization !=0">-->
 <!--                      <van-field-->
 <!--                            v-model="submitData.linkman"-->
@@ -558,4 +561,14 @@ const reciveData2 = (item) =>{
   cursor: default;
   color: #666;
 }
+
+.complaint-cont {
+  margin: -1px 3% 2%;
+  padding: 0 0.15rem 0.5rem;
+  width: 92%;
+  border-radius: 0.15rem;
+  box-sizing: border-box;
+  line-height: 1.5;
+  font-size: 0.37rem;
+}
 </style>
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index d535047..731fb60 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -69,7 +69,7 @@
                         <van-swipe-cell class="swipe_cell">
                             <div class="card_box">
                                 <div class="card_box_span">
-                                    <p>执法时间：{{ item.createTime }} <span class="card_box_action"></span></p>
+                                    <p>检查时间：{{ item.createTime }} <span class="card_box_action"></span></p>
                                 </div>
 
 
@@ -576,6 +576,7 @@
     }
 
     .card-title p {
+      display: block !important;
       color: #000;
       font-size: 0.40rem;
       font-weight: bold;