From e02c14b53ecda4912fc93c7f83b1dcb4bb7a3999 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 七月 2025 14:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/snapshot.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index 4b9f690..6e01c08 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/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]
--
Gitblit v1.9.3