From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/details_dca/details_dca.vue | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/h5/pages/details_dca/details_dca.vue b/h5/pages/details_dca/details_dca.vue
index 98ad51b..c8eb31f 100644
--- a/h5/pages/details_dca/details_dca.vue
+++ b/h5/pages/details_dca/details_dca.vue
@@ -36,7 +36,7 @@
<view class="dca_list_item" style="flex-direction: column;">
<view class="dca_list_item_label">DCA鍥剧墖</view>
<view class="dca_list_item_tu" v-if="info.multifileList">
- <view class="dca_list_item_tu_item" v-for="(item, index) in info.multifileList" :key="index">
+ <view class="dca_list_item_tu_item" v-for="(item, index) in info.multifileList" :key="index" @click="previewImage(item.fileurlFull, info.multifileList.map(item => item.fileurlFull))">
<image :src="item.fileurlFull" mode="widthFix"></image>
</view>
<view class="dca_list_item_tu_zw"></view>
@@ -59,13 +59,13 @@
<view class="dca_wt_list_item_info">
{{item.problemTitle}}
</view>
- <view class="dca_wt_list_item_btn">
+ <view class="dca_wt_list_item_btn" v-if="item.closeButton === 1">
<view class="btn" @click="handle(item.id)">澶勭悊</view>
</view>
</view>
</view>
</view>
- <!-- 浠诲姟鍒嗛厤 -->
+ <!-- 鎶勯�� -->
<u-popup :show="show" :round="10" mode="bottom">
<view class="fp">
<view class="fp_head">
@@ -87,11 +87,25 @@
</view>
</view>
</u-popup>
+ <!-- 鎶勯�佷汉 -->
+ <peng-tree
+ ref="pengTree"
+ :range="userList"
+ idKey="qwId"
+ :selectParent="false"
+ nameKey="name"
+ :multiple="true"
+ title="閫夋嫨鎶勯�佷汉"
+ @confirm="selectUser"
+ @cancel="$refs.pengTree._hide()">
+ </peng-tree>
</view>
</template>
<script>
+ import pengTree from '@/uni_modules/peng-tree/peng-tree/peng-tree.vue'
export default {
+ components: { pengTree },
data() {
return {
id: null,
@@ -110,28 +124,59 @@
message: '鎶勯�佷汉涓嶈兘涓虹┖',
trigger: ['blur', 'change']
}
- }
+ },
+ userList: []
};
},
onLoad(option) {
this.id = option.id
this.isShow = option.isShow
this.getDetails()
+ this.getUserInfo()
+
+ uni.$on('update', (data) => {
+ this.getDetails()
+ })
},
methods: {
- seleUser() {
- var that = this
- that.$ww.selectEnterpriseContact({
- fromDepartmentId: -1,
- mode: 'multi',
- type: ['user'],
- }).then(res =>{
- console.log(res)
- if (res.errCode === 0) {
- that.model.passOnUserName = res.result.userList.map(item => item.name).join(',')
- that.model.passOnUserId = res.result.userList.map(item => item.id).join(',')
- }
+ selectUser(e) {
+ this.canScroll()
+ this.model.passOnUserName = e.map(item => item.name).join(',')
+ this.model.passOnUserId = e.map(item => item.id).join(',')
+ this.$refs.pengTree._hide()
+ },
+ async getUserInfo() {
+ let res = await this.$u.api.getCopySendUserPage({
+ capacity: 9999,
+ page: 1,
+ model: {}
})
+ if (res.code === 200) {
+ console.log(res)
+ this.userList = res.data.records
+ }
+ },
+ previewImage(current, urls) {
+ uni.previewImage({
+ current,
+ urls
+ });
+ },
+ seleUser() {
+ this.stopScroll()
+ this.$refs.pengTree._show()
+ // var that = this
+ // that.$ww.selectEnterpriseContact({
+ // fromDepartmentId: -1,
+ // mode: 'multi',
+ // type: ['user'],
+ // }).then(res =>{
+ // console.log(res)
+ // if (res.errCode === 0) {
+ // that.model.passOnUserName = res.result.userList.map(item => item.name).join(',')
+ // that.model.passOnUserId = res.result.userList.map(item => item.id).join(',')
+ // }
+ // })
},
returnStatus(status) {
if ([3,4,5].includes(status)) {
@@ -165,10 +210,10 @@
workorderId: that.info.id
})
if (res.code === 200) {
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
that.canScroll()
that.show = false
that.getDetails()
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
}
}).catch(errors => {
--
Gitblit v1.9.3