Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 h5/pages/staff/snapshot.vue

@@ -19,7 +19,7 @@
      <view class="line">
        <view class="label">
          <text>*</text>
          <text>接受人</text>
          <text>接收人</text>
        </view>
        <view class="value" @click="selMember">
          <text
@@ -48,9 +48,13 @@
      <view class="upload_line">
        <view class="name">现场情况</view>
        <view class="wrap">
          <view class="adduser_list_item_ipt1_upload" @click="showUpload = true"
            ><u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon
          ></view>
          <view
            class="adduser_list_item_ipt1_upload"
            @click="showUpload = true"
          >
            <u-icon name="plus" color="rgb(153, 153, 153)" size="20"></u-icon>
            <view class="mt6">图片/视频</view>
          </view>
          <view
            class="adduser_list_item_ipt1_upload"
            v-for="(item, i) in submitFileList"
@@ -227,6 +231,14 @@
        title: '请选择隐患类型',
        icon: 'none'
      })
      if (!param.content) return uni.showToast({
        title: '请输入情况说明',
        icon: 'none'
      })
      if (param.content.length < 10) return uni.showToast({
        title: '情况说明不得小于10个字',
        icon: 'none'
      })

      DangerCreate({
        ...param,
@@ -242,6 +254,15 @@
      this.$set(this.param, 'areaId', item.id)
      this.$set(this.param, 'areaName', item.name)
      console.log(item)
      if (item.memberIds && item.memberIds.indexOf(',') === -1) {
        this.$set(this.param, 'checkUserId', item.memberIds)
        this.$set(this.param, 'applyCheckUserId', item.memberIds)
        this.$set(this.param, 'checkorName', item.memberNames)
      }else{
        this.$set(this.param, 'checkUserId', '')
        this.$set(this.param, 'applyCheckUserId', '')
        this.$set(this.param, 'checkorName', '')
      }
      this.isShowArea = false
    },
    seletedType(e) {
@@ -267,8 +288,12 @@
      })
    },
    selMember() {
      if (!this.param.areaId) return uni.showToast({
        title: '请先选择隐患区域',
        icon: 'none'
      })
      uni.navigateTo({
        url: '/pages/staff/memberSel'
        url: '/pages/staff/memberSel?areaId=' + this.param.areaId
      })
    },
    fileDel(i) {
@@ -280,7 +305,6 @@
      uni.chooseImage({
        count: 4,
        success: (chooseImageRes) => {
          console.log('chooseImageRes.tempFilePaths', chooseImageRes.tempFilePaths)
          uni.showLoading({ title: '上传中', mask: true })
          const tempFilePaths = chooseImageRes.tempFilePaths
          let imgs = tempFilePaths.map((value, index) => {
@@ -418,6 +442,7 @@
      color: #666666;
      font-size: 22rpx;
      display: flex;
      flex-direction: column;
      align-items: center;
      justify-content: center;
      position: relative;
@@ -425,6 +450,7 @@
        position: absolute;
        right: -20rpx;
        top: -20rpx;
        z-index: 9999;
      }
      image {
        width: 100%;
@@ -432,7 +458,7 @@
      }
      video {
        width: 100%;
        max-height: 160rpx;
        max-height: 120rpx;
      }
    }
  }