Merge remote-tracking branch 'origin/v3' into v3

src/views/administrative/appointment.vue

@@ -955,8 +955,9 @@
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .flex-div .van-cell::after {

src/views/administrative/appointmentDetail.vue

@@ -753,8 +753,9 @@
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .fold-div label {

src/views/administrative/appointmentEdit.vue

@@ -908,8 +908,9 @@
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .flex-div .van-cell::after {

src/views/administrative/appointmentRelaunch.vue

@@ -876,8 +876,9 @@
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .flex-div .van-cell::after {

src/views/enforce/enforcementPlanDetailed.vue

@@ -146,8 +146,9 @@ onMounted(() => {
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .fold-div label {

src/views/enforce/enterpriseBaseInfo.vue

@@ -781,8 +781,9 @@ export default {
       left: 0.43rem;
       bottom: 0;
       width: calc(100% - 0.86rem);
-      border-bottom: 1px solid #f5f6f7;
+      border-bottom: 1px solid #ebedf0;
       content: "";
+      transform: scaleY(.5);
     }
 
     .fold-div label {

src/views/enforce/scanQrCode.vue

@@ -51,7 +51,7 @@
               <!--              <div class="addinfo" @click="toRecord">补录</div>-->
 
 
-              <div class="record">仅限因特殊情形，需先检查，后登记相关检查信息，<a @click="toSign">补录 >></a></div>
+              <div class="record">如遇网络异常、设备故障无法登录系统的情况，<a @click="toSign">补录 >></a></div>
         </div>
                              <!-- <div class="recommend_box">
                                <van-cell :border="false" title="推荐" />

src/views/enterprise/enterpriseInspectionDetail.vue

@@ -336,8 +336,9 @@ onMounted(() =>{
   left: 0.43rem;
   bottom: 0;
   width: calc(100% - 0.86rem);
-  border-bottom: 1px solid #f5f6f7;
+  border-bottom: 1px solid #ebedf0;
   content: "";
+  transform: scaleY(.5);
 }
 
 .fold-div label {

src/views/enterprise/register.vue

@@ -386,8 +386,9 @@ export default {
   left: 0.43rem;
   bottom: 0;
   width: calc(100% - 0.86rem);
-  border-bottom: 1px solid #f5f6f7;
+  border-bottom: 1px solid #ebedf0;
   content: "";
+  transform: scaleY(.5);
 }
 
 .fold-div label {

src/views/enterprise/registrationDetail.vue

@@ -44,7 +44,86 @@
                                 readonly
                       />
                     </div>
+
+                      <van-field
+                          v-model="submitData.checkCategoryText"
+                          label="检查类别"
+                          readonly
+                      />
+
+                      <div class="fold-div">
+                        <label>检查事项</label>
+                        <van-text-ellipsis :content="submitData.lawEnforcementItemText" rows="2" autosize expand-text="展开" collapse-text="收起" />
+                      </div>
+                      <van-field v-for="(item, index) in data.lawList" :key="index"
+                                 v-model="item.text"
+                                 label="检查依据"
+                                 readonly
+                                 type="textarea"
+                                 rows="1"
+                                 autosize
+                      />
+                      <view  v-if="null != submitData.enforce">
+                        <van-field
+                            v-model="submitData.enforce"
+                            label="原&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;因"
+                            readonly
+                        />
+                      </view>
+                      <van-field
+                          v-model="submitData.enforcementTime"
+                          label="检查时间"
+                          readonly
+                      />
+                      <!--                    <van-field-->
+                      <!--                            v-model="submitData.lawFieldText"-->
+                      <!--                            label="检查领域"-->
+                      <!--                            readonly-->
+                      <!--                    />-->
+                      <!--                    <van-field-->
+                      <!--                      v-model="submitData.remark"-->
+                      <!--                      label="备注"-->
+                      <!--                      rows="2"-->
+                      <!--                      autosize-->
+                      <!--                      type="textarea"-->
+                      <!--                      maxlength="100"-->
+                      <!--                      show-word-limit-->
+                      <!--                      readonly-->
+                      <!--                    />-->
+
+                      <van-divider class="divdsty" />
+
+                      <div class="file-upload">
+                        <div class="file-upload-center">
+                          <label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label>
+                        </div>
+                        <!-- <van-uploader v-model="submitData.fileListObj" accept="" class="file" multiple :max-size="500 * 1024" :after-read="uploadFiles" :before-delete="deleteFile">
+                            <template #preview-cover="{ file }">
+                                <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+                            </template>
+                        </van-uploader> -->
+                        <div class="zoom">
+                          <img
+                              v-for="(item, index) in data.imageList"
+                              class="img"
+                              :src="item"
+                              alt="预览图片"
+                              @click="imagePreview(index)"
+                              :key="index"
+                          />
+                          <van-image-preview v-model:show="data.show" :images="data.imageList" @change="onChange" ref="imagePre">
+                            <template v-slot:index>第{{ index + 1 }}页</template>
+                          </van-image-preview>
+
                         </div>
+                      </div>
+                    </div>
+              </van-cell-group>
+
+              <van-divider class="divdsty" />
+
+
+              <van-cell-group>
                   <div v-if="submitData.uniteCheck != '' && submitData.uniteCheck != null">
                    <div class="zf-name">
                       执法信息
@@ -71,32 +150,6 @@
                     </div>
                       </div>
                   </div>
-                  <!-- <van-field
-                      v-model="submitData.lawEnforcement"
-                      label="执法部门"
-                      readonly
-                  />
-                  <div class="one-label">
-                    <van-field
-                        v-model="submitData.lawEnforcer"
-                        label="执法人员"
-                        readonly
-                    />
-                    <van-field class="no-label"
-                               v-for="(item, index) in data.lawCer" :key="index"
-                               v-model="item.show"
-                               label=" "
-                               readonly
-                    />
-                  </div> -->
-
-                <!-- <div v-show="submitData.uniteCheck == '' || submitData.uniteCheck == null">
-                  <van-field v-for="(item, index) in data.lawCer" :key="index"
-                    v-model="item.show"
-                    label="执法人员"
-                    readonly
-                  />
-                </div> -->
 
                   <div :class="is_show ? 'new_detail' : 'work_detail'">
 
@@ -105,15 +158,7 @@
                         label="检查类别"
                         readonly
                     />
-<!--                    <van-field
+
-                        v-model="submitData.lawEnforcementItemText"
-                        label="检查事项"
-                        rows="2"
-                        autosize
-                        readonly
-                        type="textarea"
-                        show-word-limit
-                    />-->
                   <div class="fold-div">
                     <label>检查事项</label>
                     <van-text-ellipsis :content="submitData.lawEnforcementItemText" rows="2" autosize expand-text="展开" collapse-text="收起" />
@@ -784,7 +829,7 @@ export default {
 }
 
 /deep/ .complaint-cont textarea.van-field__control {
-  padding: 0.1rem 0.2rem;
+  padding: 0.2rem 0.3rem;
   background: #f5f6f7;
   border-radius: 0.15rem;
   line-height: 1.25;
@@ -805,8 +850,9 @@ export default {
   left: 0.43rem;
   bottom: 0;
   width: calc(100% - 0.86rem);
-  border-bottom: 1px solid #f5f6f7;
+  border-bottom: 1px solid #ebedf0;
   content: "";
+  transform: scaleY(.5);
 }
 
 .fold-div label {
@@ -826,11 +872,12 @@ export default {
 
 .one-label::after {
   position: absolute;
-  left: 0;
+  left: 0.43rem;
   bottom: 0;
-  width: 100%;
+  width: calc(100% - 0.86rem);
-  border-bottom: 0.18rem solid #f5f6f7;
+  border-bottom: 1px solid #ebedf0;
   content: "";
+  transform: scaleY(.5);
 }
 
 .one-label .van-cell:first-child {