From 4248a018451b388d78e1b45abc0ee628e46838e7 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Thu, 19 Sep 2024 18:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF=E9=A2=84=E5=91=8A?=
 =?UTF-8?q?=E8=81=94=E5=AD=97,=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E9=83=A8=E9=97=A8=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../administrative/appointmentDetail.vue      | 23 +++++++++++++++++--
 .../enterprise/enterpriseInspectionDetail.vue | 23 +++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index 7b169d5..fff7135 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -9,6 +9,7 @@
                         :rules="[{ required: true, message: '必填项' }]"
                         readonly
                 />
+                <span class="joint-mark" v-if="submitData.isUnite == 1">联</span>
                 <Popup :visible="popupVisible" :content="popupContent" @close="closePopupCompony"  @reciveData="reciveData" />
                 <van-field
                         v-model="submitData.linkMan"
@@ -33,16 +34,16 @@
                           is-link
                           label="检查时间"
                           placeholder="日期"
+                          readonly
                           :rules="[{ required: true, message: '必填项' }]"
-                          @click="data.showTimePicker = true"
                   />
                   <van-field
                       v-model="submitData.checkTimeOrderText"
                       is-link
                       label=""
                       placeholder="时段"
+                      readonly
                       :rules="[{ required: true, message: '必填项' }]"
-                      @click="data.checkTimePicker = true"
                   />
                 </div>
 
@@ -392,6 +393,7 @@
                 submitData.lawEnforcerText = success.data['lawEnforcer'] + " " +success.data['lawEnforcerText'];
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
                 submitData.isSubmit =success.data['isSubmit'];
+                submitData.isUnite = success.data['isUnite'];
                 submitData.isReg = success.data['isReg'];
                 submitData.status = success.data['status'];
                 submitData.linkMan=nameCorrect(submitData['linkMan']);
@@ -906,4 +908,21 @@
       padding-left: 0.2rem;
       width: 62%;
     }
+
+
+
+    .joint-mark {
+      position: relative;
+      top: -0.05rem;
+      display: inline-block;
+      margin: 0 0.25rem;
+      width: 0.55rem;
+      height: 0.55rem;
+      background: #2d94fa;
+      border-radius: 50%;
+      color: #fff;
+      font-size: 0.35rem;
+      line-height: 1.65;
+      text-align: center;
+    }
 </style>
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index fbb4d65..892db71 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -20,11 +20,24 @@
 <!--                readonly-->
 <!--                label="执法部门"-->
 <!--            />-->
-              <van-field v-for="(item, index) in data.bureauDeptNames"
-                      v-model="data.bureauDeptNames[index]"
-                      readonly
-                      :label="'执法部门'+(index+1)"
-              />
+<!--              <van-field v-for="(item, index) in data.bureauDeptNames"-->
+<!--                      v-model="data.bureauDeptNames[index]"-->
+<!--                      readonly-->
+<!--                      :label="'执法部门'+(index+1)"-->
+<!--              />-->
+
+              <div class="one-label">
+                  <van-field
+                          label="执法部门"
+                          readonly
+                  />
+                  <van-field class="no-label"
+                             v-for="(item, index) in data.bureauDeptNames" :key="index"
+                             v-model="data.bureauDeptNames[index]"
+                             label=" "
+                             readonly
+                  />
+              </div>
 <!--            <van-field
                 v-model="submitData.checkItem"
                 label="检查事项"