Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

zhongrj

2024-01-09 9ab5feb38bf6db6d02b9403dd61bee5ab49a79c9

 subPackage/label/school.vue

@@ -13,7 +13,7 @@
                  inputAlign="right"></u-input>
            </u-form-item>
            <u-form-item label="自查时间" prop="checkTime" borderBottom required @click="showSelectDate = true">
               <u-input v-model="info.checkTime" disabled disabledColor="#ffffff" border="none" placeholder="请输入"
               <u-input v-model="info.checkTime" disabled disabledColor="#ffffff" border="none" placeholder="请选择"
                  placeholderClass="f-28 c-99" inputAlign="right"></u-input>
               <u-icon slot="right" name="arrow-right"></u-icon>
            </u-form-item>
@@ -22,8 +22,8 @@
                  inputAlign="right"></u-input>
            </u-form-item>
            <u-form-item label="自查人手机" prop="checkTelephone" borderBottom required>
               <u-input v-model="info.checkTelephone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
                  inputAlign="right"></u-input>
               <u-input type="number" v-model="info.checkTelephone" border="none" placeholder="请输入"
                  placeholderClass="f-28 c-99" inputAlign="right"></u-input>
            </u-form-item>
            <u-form-item label="自查位置" prop="location" borderBottom ref="location" required>
               <view class="address-row flex">
@@ -84,7 +84,8 @@
               <u-upload :fileList="fireFacsImageUrls" :previewFullImage="uploadConfig.previewFullImage"
                  :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                  :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
                  @afterRead="afterReadImgs($event,'fireFacsImageUrls')" @delete="deletePics($event,'fireFacsImageUrls')">
                  @afterRead="afterReadImgs($event,'fireFacsImageUrls')"
                  @delete="deletePics($event,'fireFacsImageUrls')">
                  <view class="upload-item upload-icon flex_base">
                     <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
                  </view>
@@ -120,7 +121,8 @@
               <u-upload :fileList="patrolImageUrls" :previewFullImage="uploadConfig.previewFullImage"
                  :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                  :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
                  @afterRead="afterReadImgs($event,'patrolImageUrls')" @delete="deletePics($event,'patrolImageUrls')">
                  @afterRead="afterReadImgs($event,'patrolImageUrls')"
                  @delete="deletePics($event,'patrolImageUrls')">
                  <view class="upload-item upload-icon flex_base">
                     <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
                  </view>
@@ -138,13 +140,14 @@
            </u-form-item>
         </view>

         <view class="upload bgc-ff mb-20"  v-if="info.antiCollision == '有'">
         <view class="upload bgc-ff mb-20" v-if="info.antiCollision == '有'">
            <view class="f-28 mb-20">校园防撞装置照片</view>
            <view class="mt-20">
               <u-upload :fileList="antiCollisionImageUrls" :previewFullImage="uploadConfig.previewFullImage"
                  :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
                  :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
                  @afterRead="afterReadImgs($event,'antiCollisionImageUrls')" @delete="deletePics($event,'antiCollisionImageUrls')">
                  @afterRead="afterReadImgs($event,'antiCollisionImageUrls')"
                  @delete="deletePics($event,'antiCollisionImageUrls')">
                  <view class="upload-item upload-icon flex_base">
                     <u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
                  </view>
@@ -157,7 +160,7 @@
               <u-input type="number" v-model="info.fullSoNums" border="none" placeholder="请输入"
                  placeholderClass="f-28 c-99" inputAlign="right"></u-input>
            </u-form-item>
            <u-form-item label="兼职保安人数" prop="partSoNums" borderBottom required >
            <u-form-item label="兼职保安人数" prop="partSoNums" borderBottom required>
               <u-input type="number" v-model="info.partSoNums" border="none" placeholder="请输入"
                  placeholderClass="f-28 c-99" inputAlign="right"></u-input>
            </u-form-item>
@@ -230,7 +233,7 @@
               highAltitudeMonitor: '',
               houseCode: "",
               checkUserId: "",
               reportType:6
               reportType: 6
            },
            rules: {
               // 'districtName': {
@@ -251,18 +254,28 @@
                  message: '请选择自查时间',
                  trigger: ['blur', 'change']
               },
               'checkName': {
               'checkUserName': {
                  type: 'string',
                  required: true,
                  message: '请输入自查人姓名',
                  trigger: ['blur', 'change']
               },
               'checkTelephone': {
                  type: 'number',
                  required: true,
                  message: '请输入自查人手机',
                  trigger: ['blur', 'change']
               },
               'checkTelephone': [{
                     type: 'number',
                     required: true,
                     message: '请输入自查人手机',
                     trigger: ['blur', 'change']
                  },

                  {
                     validator: (rule, value, callback) => {
                        return uni.$u.test.mobile(value);
                     },
                     message: '手机号码不正确',
                     trigger: ['change', 'blur']
                  }

               ],
               'location': {
                  type: 'string',
                  required: true,
@@ -383,15 +396,15 @@
      },

      methods: {
			
         getLocation(){

         getLocation() {
            uni.chooseLocation({
               success:(res)=>{
                  this.$set(this.info,"location",res.address);
               success: (res) => {
                  this.$set(this.info, "location", res.address);
               }
            })
         },
			

         formatter(type, value) {
            if (type === 'year') {
               return `${value}年`