wkyy 1 rok pred
rodič
commit
a339f43f55

+ 7 - 0
pages/workOrderManagement/faultReport.vue

@@ -129,6 +129,13 @@
 					})
 					return
 				}
+				if(!this.faultForm.content){
+					uni.showToast({
+						icon: "none",
+						title: "请填写故障描述"
+					})
+					return
+				}
 				
 				uni.showLoading({
 					title: "加载中",

+ 19 - 14
pages/workOrderManagement/workOrderDetails.vue

@@ -6,18 +6,18 @@
 		<view class="main">
 			<view class="title">
 				<view class="number">
-					工单编号:JP10001
+					工单编号:{{detail.billNum}}
 				</view>
-				<view class="state">
+				<view class="state" v-if="detail.status == 'dispatched'">
 					进行中
 				</view>
-				<view class="state state2">
-					处理中
+				<view class="state state2" v-if="detail.status == 'created'">
+					待指派
 				</view>
-				<view class="state state3">
+				<view class="state state3" v-if="detail.status == 'ended'">
 					已解决
 				</view>
-				<view class="state state4">
+				<view class="state state4" v-if="detail.status == 'closed'">
 					已关闭
 				</view>
 			</view>
@@ -57,15 +57,15 @@
 						{{detail.createTime}}
 					</view>
 				</view>
-				<view class="content-picture">
+				<view class="content-picture" v-if="picList.length != 0">
 					<view class="picture-title">
 						现场照片/视频
 					</view>
 					<view class="picture-box">
-						<image v-for="item in 4" class="img" src="@/assets/img/pImage@1x.png" mode=""></image>
+						<image v-for="item in picList" class="img" :src="item" mode=""></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" v-if="detail.status != 'created'">
 					<view class="item-title">
 						运维专员
 					</view>
@@ -81,7 +81,7 @@
 		</view>
 
 		<!-- 处理记录 -->
-		<view class="record">
+		<view class="record" v-if="false">
 			<view class="title">
 				<view class="icon">
 
@@ -160,7 +160,7 @@
 			</view>
 		</view>
 		<!-- 底部 -->
-		<view class="bottom">
+		<view class="bottom" v-if="detail.status == 'dispatched'">
 			<button class="back" @click="back">返回</button>
 			<button class="confirm" @click="resultShow=true">确认解决</button>
 		</view>
@@ -201,6 +201,7 @@
 	export default {
 		data() {
 			return {
+				picList: [],
 				detail: {}, //工单详细
 				resultShow: false,
 				action: '',
@@ -231,7 +232,9 @@
 				})
 				API_workOrder.workOrderDetail(id).then((res) => {
 					uni.hideLoading();
-					this.detail = res.data
+					this.detail = res.data;
+					this.picList = res.data.pic.split(',');
+					console.log(this.picList)
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -278,8 +281,10 @@
 			}
 
 			.state2 {
-				color: rgba(255, 68, 68, 1);
-				border: 1px solid rgba(255, 68, 68, 1);
+				color: rgba(255,123,0,1);
+				border: 1px solid rgba(255,123,0,1);
+				// color: rgba(255, 68, 68, 1);
+				// border: 1px solid rgba(255, 68, 68, 1);
 			}
 
 			.state3 {

+ 8 - 8
pages/workOrderManagement/workOrderManagement.vue

@@ -87,23 +87,23 @@
 				</view>
 
 				<view class="button">
-					<view class="state">
+					<view class="state" v-if="item.status == 'created'">
 						待指派
 					</view>
-					<view class="state state2" v-if="false">
+					<view class="state state2" v-if="item.status == 'dispatched'">
 						进行中
 					</view>
-					<view class="state state3" v-if="false">
+					<view class="state state3" v-if="item.status == 'ended'">
 						已解决
 					</view>
-					<view class="state state4" v-if="false">
+					<view class="state state4" v-if="item.status == 'closed'">
 						已关闭
 					</view>
 					<view class="btn">
-						<button class="close" @click="closeShow=true">关闭</button>
-						<button class="reminder" @click="reminderShow=true">催单</button>
-						<button class="resolved" v-if="false">确认解决</button>
-						<button class="view" v-if="false">查看详情</button>
+						<button class="close" @click="closeShow=true" v-if="item.status == 'created'">关闭</button>
+						<button class="reminder" @click="reminderShow=true" v-if="item.status == 'created'">催单</button>
+						<button class="resolved" v-if="item.status == 'dispatched'">确认解决</button>
+						<button class="view" v-if="item.status == 'ended' || item.status == 'closed'">查看详情</button>
 					</view>
 				</view>
 			</view>