From b850badcf800eff5819e0789d1b81e5e27fcd037 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 29 十一月 2024 17:21:34 +0800
Subject: [PATCH] ll
---
h5/pages/workOrder/detail.vue | 108 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 35 deletions(-)
diff --git a/h5/pages/workOrder/detail.vue b/h5/pages/workOrder/detail.vue
index 1b763a0..a3bf40d 100644
--- a/h5/pages/workOrder/detail.vue
+++ b/h5/pages/workOrder/detail.vue
@@ -2,59 +2,63 @@
<view>
<view class="main_info">
<view class="title">
- <text>闃滃畞鏂囦綋涓績/A搴�/401</text>
- <text class="status">寰呭鐞�</text>
+ <text>{{ info.projectName }}/{{ info.buildingName }}/{{info.roomNum || info.floorName}}</text>
+ <text class="status" v-if="info.dealStatus == 0">寰呭鐞�</text>
+ <text class="status" v-if="info.dealStatus == 1">宸叉寚娲�</text>
+ <text class="status gray" v-if="info.dealStatus == 2">宸插鐞�</text>
</view>
- <view class="desc">瑗胯竟璧板粖鐨勪竴涓《鐏潖浜嗭紝涓嶄寒闇�瑕佺淮淇タ杈�</view>
+ <view class="desc">{{ info.content }}</view>
<view class="file_list">
- <view class="file">
-
+ <view class="file" v-for="(item,index) in info.fileList">
+ <image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
<view class="content">
- <view class="line">
+ <view class="line" v-if="info.categoryName">
<view class="la">宸ュ崟绫诲瀷锛�</view>
- <view class="val">1111</view>
+ <view class="val">{{info.categoryName}}</view>
</view>
<view class="line">
<view class="la">涓婃姤浜猴細</view>
- <view class="val">1111</view>
+ <view class="val">{{ info.creatorName }}{{info.creatorCompany ? '-' + info.creatorCompany : ''}}</view>
</view>
- <view class="line">
+ <view class="line" v-if="info.creatorPhone">
<view class="la">鑱旂郴鐢佃瘽锛�</view>
- <view class="val">1111</view>
+ <view class="val">{{ info.creatorPhone }}</view>
</view>
<view class="line">
<view class="la">涓婃姤鏃堕棿锛�</view>
- <view class="val">1111</view>
+ <view class="val">{{ info.createDate }}</view>
</view>
- <view class="line">
+ <view class="line" v-if="info.getDate">
<view class="la">涓婇棬鏃堕棿锛�</view>
- <view class="val">1111</view>
+ <view class="val">{{ info.getDate }}</view>
</view>
</view>
- <view class="result_wrap">
+ <view class="result_wrap" v-if="info.dealStatus == 2">
<div class="title">澶勭悊缁撴灉</div>
- <view class="file_list">
- <view class="file">
-
+ <view v-if="info.dealFileList && info.dealFileList.length > 0" class="file_list">
+ <view class="file" v-for="item in info.dealFileList">
+ <image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
+ <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
- <view class="content">
- 宸叉洿鎹㈢伅娉″拰鐏僵宸叉洿鎹㈢伅娉″拰鐏僵宸叉洿鎹㈢伅
+ <view v-if="info.dealInfo" class="content">
+ {{info.dealInfo}}
</view>
<view class="line">
<view class="la">澶勭悊浜猴細</view>
- <view class="val">{{ 1111 }}</view>
+ <view class="val">{{ info.dealUserName }}</view>
</view>
<view class="line">
<view class="la">澶勭悊鏃堕棿锛�</view>
- <view class="val">{{ 1111 }}</view>
+ <view class="val">{{ info.dealDate }}</view>
</view>
</view>
</view>
<!-- -->
- <view class="btns">
+ <view class="btns" v-if="info.dealStatus == 0">
<view class="btn">
<image src="@/static/side/phoneed.png" class="icon"></image>
<text>涓婃姤浜�</text>
@@ -62,7 +66,7 @@
<view class="btn active" @click="isShowHandle = true">鍘诲鐞�</view>
</view>
<!-- -->
- <u-popup :show="showUpload" @close="showUpload = false" closeOnClickOverlay>
+ <u-popup :show="showUpload" @close="showUpload = false" zIndex="10076" closeOnClickOverlay>
<view class="sel_upload_wrap">
<view class="btn" @click="uploadImage">閫夋嫨鍥剧墖</view>
<view class="btn" @click="uploadVideo">閫夋嫨瑙嗛</view>
@@ -70,11 +74,12 @@
</u-popup>
<!-- -->
<!-- 宸ュ崟澶勭悊 -->
- <u-popup :show="isShowHandle" :round="10" :safeAreaInsetBottom="true" mode="bottom" closeable @close="isShowHandle = false">
+ <u-popup :show="isShowHandle" :round="10" :safeAreaInsetBottom="true" mode="bottom" closeable
+ @close="isShowHandle = false">
<view class="appr_modal">
<view class="title">宸ュ崟澶勭悊</view>
<view class="df_sb">
- <view>澶勭悊鏃堕棿</view>
+ <view><text class="red">*</text>澶勭悊鏃堕棿</view>
<view class="df_ac" @click="isShowHandleDate = true" v-if="handleParam.dealTime">
{{ handleParam.dealTime }}
<u-icon name="arrow-right"></u-icon>
@@ -86,7 +91,6 @@
</view>
<view class="label">
- <text>*</text>
涓婁紶鍥剧墖/瑙嗛
</view>
<view class="upload_wrap">
@@ -119,12 +123,16 @@
<script>
import {
- uploadUrl
+ uploadUrl,
+ ywWorkorderD,
+ ywWorkorderDeal
} from '@/api'
import dayjs from 'dayjs';
export default {
data() {
return {
+ id: '',
+ info: {},
showUpload: false,
isShowHandle: false,
isShowHandleDate: false,
@@ -132,9 +140,30 @@
dealFileList: []
};
},
+ onLoad(option) {
+ console.log(option);
+ this.id = option.id
+ this.getDetail()
+ },
methods: {
- onSubmit() {
-
+ onSubmit() {
+ const { handleParam, dealFileList, id } = this
+ if (!handleParam.dealTime) return this.showToast('澶勭悊鏃堕棿涓嶈兘涓虹┖')
+ ywWorkorderDeal({
+ ...handleParam,
+ id,
+ dealFileList
+ }).then(res => {
+ if(res.code == 200){
+ this.showToast('鎿嶄綔鎴愬姛')
+ uni.navigateBack()
+ }
+ })
+ },
+ getDetail() {
+ ywWorkorderD(this.id).then(res => {
+ this.info = res.data
+ })
},
callPhone() {
uni.makePhoneCall({
@@ -152,7 +181,7 @@
this.showUpload = false;
let token = uni.getStorageSync('token') || '';
uni.chooseImage({
- count: 4,
+ count: 6,
success: chooseImageRes => {
uni.showLoading({
title: '涓婁紶涓�',
@@ -170,7 +199,7 @@
files: imgs,
name: 'file',
formData: {
- folder: 'HIDDEN_DANGER_FILE'
+ folder: 'YW_WORKORDER_FILE'
},
header: {
Dm_user_token: token
@@ -182,7 +211,7 @@
i.type = 0;
i.fileurl = i.imgaddr;
i.fileurlFull = i.url;
- this.submitFileList.push(i);
+ this.dealFileList.push(i);
});
}
},
@@ -216,7 +245,7 @@
},
name: 'file',
formData: {
- folder: 'HIDDEN_DANGER_FILE'
+ folder: 'YW_WORKORDER_FILE'
},
success: uploadFileRes => {
let res = JSON.parse(uploadFileRes.data);
@@ -225,7 +254,7 @@
i.type = 1;
i.fileurl = i.imgaddr;
i.fileurlFull = i.url;
- this.submitFileList.push(i);
+ this.dealFileList.push(i);
});
}
},
@@ -264,6 +293,10 @@
font-size: 28rpx;
color: $primaryColor;
}
+
+ .gray {
+ color: #999999;
+ }
}
.file_list {
@@ -279,6 +312,11 @@
&:nth-of-type(4n) {
margin-right: 0;
+ }
+
+ image,
+ video {
+ width: 156rpx;
}
}
}
@@ -368,7 +406,7 @@
.sel_upload_wrap {
width: 100%;
- border-top: 1px solid #333333;
+ border-top: 1px solid #666666;
box-shadow: 0 1 1 #333333;
.btn {
--
Gitblit v1.9.3