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/workOrder_she/workOrder_she.vue | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/h5/pages/workOrder_she/workOrder_she.vue b/h5/pages/workOrder_she/workOrder_she.vue
index 73086fc..1083ca0 100644
--- a/h5/pages/workOrder_she/workOrder_she.vue
+++ b/h5/pages/workOrder_she/workOrder_she.vue
@@ -37,7 +37,7 @@
<view class="dca_list_item" style="flex-direction: column;">
<view class="dca_list_item_label">鍥剧墖</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>
@@ -53,7 +53,7 @@
<view class="lc">
<view class="lc_item" v-for="(item, index) in info.logList" :key="index">
<view class="lc_item_dian"></view>
- <view class="lc_item_xian" v-if="info.logList.length === 1 ? false : index === 0"></view>
+ <view class="lc_item_xian" v-if="info.logList.length === 1 ? false : index !== info.logList.length - 1"></view>
<view class="lc_item_title">{{item.title}}</view>
<view class="lc_item_info">{{item.companyName}}/{{item.userName}} {{item.createDate}}</view>
<view class="lc_item_content" v-if="![0,4].includes(item.objType)">
@@ -73,8 +73,8 @@
<view class="lc_item_content_item">
<view class="lc_item_content_item_label">鍥剧墖锛�</view>
<view class="lc_item_content_item_img" v-if="item.multifileList">
- <view class="image" v-for="(item, index) in item.multifileList" :key="index">
- <image :src="item.fileurlFull" mode="widthFix"></image>
+ <view class="image" v-for="(child, index) in item.multifileList" :key="index" @click="previewImage(child.fileurlFull, item.multifileList.map(item => item.fileurlFull))">
+ <image :src="child.fileurlFull" mode="widthFix"></image>
</view>
<view class="imagezw"></view>
<view class="imagezw"></view>
@@ -86,7 +86,7 @@
</view>
<view class="lc_item_content" v-else-if="item.objType === 4">
<view class="lc_item_content_item">
- <view class="lc_item_content_item_label">宸插偓淇冿細</view>
+ <!-- <view class="lc_item_content_item_label">宸插偓淇冿細</view> -->
<view class="lc_item_content_item_val">
<text>{{item.content}}</text>
</view>
@@ -125,6 +125,7 @@
@afterRead="afterRead"
@delete="deletePic"
name="2"
+ multiple
style="margin-top: 15rpx;" />
</u-form-item>
</u--form>
@@ -150,6 +151,7 @@
@afterRead="afterRead"
@delete="deletePic"
name="1"
+ multiple
style="margin-top: 15rpx;" />
</u-form-item>
</u--form>
@@ -207,6 +209,12 @@
this.getDetails()
},
methods: {
+ previewImage(current, urls) {
+ uni.previewImage({
+ current,
+ urls
+ });
+ },
openGB() {
this.stopScroll()
this.show1 = true
@@ -257,7 +265,8 @@
info: that.model.info,
passOnUserId: that.model.passOnUserId,
multifileList: that.model.multifileList,
- workorderId: that.info.id
+ workorderId: that.info.id,
+ passOnType: this.info.status
})
if (res.code === 200) {
uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
@@ -273,10 +282,7 @@
async urge() {
let res = await this.$u.api.urge({ workorderId: this.info.id })
if (res.code === 200) {
- uni.showToast({
- title: '鎿嶄綔鎴愬姛',
- icon: 'none'
- })
+ uni.showToast({ title: '鍌績鎴愬姛', icon: 'none' })
this.getDetails()
this.show2 = false
}
@@ -320,21 +326,43 @@
},
// 鏂板鍥剧墖
afterRead(event) {
+ var that = this
+ uni.showLoading({ title: '涓婁紶涓�...', mask: true })
uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: event.file.url,
- name: "file",
+ url: this.$baseUrl + '/web/public/uploadBatch',
+ files: event.file.map(e => {
+ return { name: 'files', uri: e.url }
+ }),
formData: {
- folder: "WORKORDER_LOG_FILE_PATH"
- },
- success: (res) => {
+ folder: "WORKORDER_LOG_FILE_PATH",
+ },
+ success(res) {
+ uni.hideLoading();
let obj = JSON.parse(res.data)
if (obj.code === 200) {
- obj.data.fileurl = obj.data.imgaddr
- this.model.multifileList.push(obj.data)
+ console.log(obj.data)
+ obj.data.forEach(item => {
+ item.fileurl = item.imgaddr
+ })
+ that.model.multifileList = [...that.model.multifileList, ...obj.data]
}
}
- });
+ })
+ // uni.uploadFile({
+ // url: this.$baseUrl + '/web/public/upload',
+ // filePath: event.file.url,
+ // name: "file",
+ // formData: {
+ // folder: "WORKORDER_LOG_FILE_PATH"
+ // },
+ // success: (res) => {
+ // let obj = JSON.parse(res.data)
+ // if (obj.code === 200) {
+ // obj.data.fileurl = obj.data.imgaddr
+ // this.model.multifileList.push(obj.data)
+ // }
+ // }
+ // });
}
}
}
--
Gitblit v1.9.3