Merge remote-tracking branch 'origin/master'

jiangping

2025-07-01 e02c14b53ecda4912fc93c7f83b1dcb4bb7a3999

 h5/pages/staff/snapshot.vue

@@ -19,9 +19,9 @@
               <text>*</text>

               <text>检查类型</text>

            </view>

            <view class="value" @click="openArea">

            <view class="value" @click="isShow = true">

               <text class="mr6"

                  :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "请选择" }}</text>

                  :style="{ color: param.checkTypeName ? '#000000' : '#999999' }">{{ param.checkTypeName ? param.checkTypeName : "请选择" }}</text>

               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>

            </view>

         </view>

@@ -87,7 +87,7 @@
               <text>情况说明</text>

            </view>

            <view class="value">

               <textarea placeholder="请详细描述现场情况，不少于10个字" minlength="10" v-model="param.content"

               <textarea placeholder="请详细描述现场情况" v-model="param.content"

                  placeholder-style="color: #999999;" />

            </view>

         </view>

@@ -132,6 +132,9 @@
         @close="isShowArea = false" @cancel="isShowArea = false"></u-picker>

      <u-picker keyName="name" :show="isShowType" closeOnClickOverlay :columns="areaType" @confirm="seletedType"

         @close="isShowType = false" @cancel="isShowType = false"></u-picker>

      <!-- 检查类型 -->

      <u-picker keyName="name" :show="isShow" closeOnClickOverlay :columns="checkTypeList" @confirm="seletedTypeVal"

         @close="isShow = false" @cancel="isShow = false"></u-picker>

      <!--  -->

      <u-datetime-picker :show="isShowTime" :formatter="formatter" :minDate="new Date().getTime()" mode="datetime" closeOnClickOverlay

         @cancel="isShowTime = false" @close="isShowTime = false" @confirm="seletedDate"></u-datetime-picker>

@@ -159,6 +162,7 @@
            param: {},

            submitFileList: [],



            isShow: false,

            isShowCompany: false,

            isShowArea: false,

            isShowType: false,

@@ -168,6 +172,7 @@
            deptList: [],

            areaOptions: [],

            areaType: [],

            checkTypeList: [],

         }

      },

      onLoad(option) {

@@ -287,6 +292,13 @@
            console.log(item)

            this.isShowType = false

         },

         seletedTypeVal(e) {

            const item = e.value[0]

            this.$set(this.param, 'checkTypeId', item.id)

            this.$set(this.param, 'checkTypeName', item.name)

            console.log(item)

            this.isShow = false

         },

         seletedSafety(e) {



         },

@@ -301,6 +313,13 @@
               this.deptList = [res.data]

            })

            DangerConfigType({

               type: '2'

            }).then(res => {

               this.checkTypeList = [res.data]

               this.$set(this.param, 'checkTypeId', res.data[0].id)

               this.$set(this.param, 'checkTypeName', res.data[0].name)

            })

            DangerConfigType({

               type: '1'

            }).then(res => {

               this.areaType = [res.data]