From 59f4dc012a2c42eebd31301444e0f8df9af088e0 Mon Sep 17 00:00:00 2001
From: wjt <1797368093@qq.com>
Date: 星期三, 26 六月 2024 10:13:12 +0800
Subject: [PATCH] Merge branch 'master' of http://218.28.192.34:9999/r/sqys/sqys_xcx

---
 qiye/complaint/details.vue |  351 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 179 insertions(+), 172 deletions(-)

diff --git a/qiye/complaint/details.vue b/qiye/complaint/details.vue
index 98ec88e..a5b1b47 100644
--- a/qiye/complaint/details.vue
+++ b/qiye/complaint/details.vue
@@ -8,7 +8,9 @@
 		<view class="donw-box"></view>
 		<view class="page-main">
 			<view class="title">
-				宸茶瘎浠�
+				<template v-if="msg.orderStatus>2&&msg.isEva==0">宸叉墽娉曞緟璇勪环</template>
+				<template v-if="msg.orderStatus>2&&msg.isEva==1">宸茶瘎浠�</template>
+				<template v-if="msg.orderStatus==2">寰呮墽娉�</template>
 			</view>
 			<view class="wbox">
 				<view class="item">
@@ -45,53 +47,53 @@
 				</view>
 			</view>
 			<view style="height: 20rpx;"></view>
-			<template v-if="orderId">
-				<view class="wbox">
-					<view class="item">
-						<view class="k">
-							鎵ф硶涓婚
-						</view>
-						<view class="v">
-							{{details.enforceReason}}
-						</view>
-					</view>
-					<view class="item">
-						<view class="k">
-							鎵ф硶杩囩▼
-						</view>
-					</view>
-					<view class="imgbox">
-						<img :src="baseUrl+item" v-for="(item,index) in orderDetailsMsg.regionImgs" :key="index" class="more" @click="imgclick(item)" alt="" />
-						
-					</view>
-					<view class="item">
-						<view class="k">
-							鎵ф硶缁撴灉
-						</view>
-						<view class="v" style="color: #EB4746;">
-							<!-- {{details.regionStatus == 0? "姝e父" : "鍋滀笟鏁撮】" }} -->
-							{{orderDetailsMsg.regionReason}}
-						</view>
-					</view>
-					<view class="item">
-						<view class="k">
-							鎵ф硶鏃堕棿
-						</view>
-						<view class="v">
-							{{details.executeTime}}
-						</view>
-					</view>
-				</view>
-				<view style="height: 20rpx;"></view>
+			<template v-if="orderId">
+				<view class="wbox">
+					<view class="item">
+						<view class="k">
+							鎵ф硶涓婚
+						</view>
+						<view class="v">
+							{{details.enforceReason}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="k">
+							鎵ф硶杩囩▼
+						</view>
+					</view>
+					<view class="imgbox">
+						<img :src="baseUrl+item" v-for="(item,index) in orderDetailsMsg.regionImgs" :key="index" class="more" @click="imgclick(item)" alt="" />
+						
+					</view>
+					<view class="item">
+						<view class="k">
+							鎵ф硶缁撴灉
+						</view>
+						<view class="v" style="color: #EB4746;">
+							<!-- {{details.regionStatus == 0? "姝e父" : "鍋滀笟鏁撮】" }} -->
+							{{orderDetailsMsg.regionReason}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="k">
+							鎵ф硶鏃堕棿
+						</view>
+						<view class="v">
+							{{details.executeTime}}
+						</view>
+					</view>
+				</view>
+				<view style="height: 20rpx;"></view>
 			</template>
 			<view class="wbox2">
 				<view class="t">
 					鎶曡瘔璁板綍
 				</view>
 				<view class="jilu" :class="{start: item.nodeName == '鍙戣捣鎶曡瘔' || item.nodeName == '宸插姙缁�', handler: item.nodeName == '澶勭悊涓�', nonde: index == nodeList.length - 1}" v-for="(item,index) in nodeList" :key="index">
-					<image src="/static/policy/icon.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '鍙戣捣鎶曡瘔'"/>
-					<image src="/static/guocheng.png" class="img" alt=""  mode="widthFix"  v-if="item.nodeName == '澶勭悊涓�'"/>
-					<image src="/static/policy/refject.png" class="img"  mode="widthFix" alt="" v-if="item.nodeName == '宸查┏鍥�'"/>
+					<image src="/static/policy/icon.png" class="img" alt="" mode="widthFix" v-if="item.nodeName == '鍙戣捣鎶曡瘔'"/>
+					<image src="/static/guocheng.png" class="img" alt=""  mode="widthFix"  v-if="item.nodeName == '澶勭悊涓�'"/>
+					<image src="/static/policy/refject.png" class="img"  mode="widthFix" alt="" v-if="item.nodeName == '宸查┏鍥�'"/>
 					<image src="/static/policy/icon.png" class="img" alt=""  mode="widthFix" v-if="item.nodeName == '宸插姙缁�'"/>
 					<view class="font" style="width: calc(100% - 50rpx);">
 						<view class="h" >
@@ -110,12 +112,16 @@
 								<span>鐢宠瘔涓婚锛�</span>
 								{{dictLabel1}}
 							</view>
-							<view class="p">
+							<view class="p" style="margin-bottom: 18rpx;">
 								<span>鐢宠瘔鍐呭锛�</span>
 								{{details.complaintReason}}
+							</view>
+							<view class="p"  v-if="item.nodeName == '宸查┏鍥�'">
+								<span>椹冲洖鍘熷洜锛�</span>
+								{{item.nodeReason}}
 							</view>
-							<view class="p"  v-if="item.nodeName == '宸查┏鍥�'">
-								<span>鐢宠瘔鍐呭锛�</span>
+							<view class="p"  v-if="item.nodeName == '宸插姙缁�' && item.nodeReason">
+								<span>鍔炵粨缁撴灉锛�</span>
 								{{item.nodeReason}}
 							</view>
 						</view>
@@ -126,7 +132,33 @@
 					<view class="font">
 						<view class="h">
 							<view class="s">
-								宸查┏鍥�
+								{{item.nodeName}}
+							</view>
+							<view class="time">
+								{{item.nodeTime}}
+							</view>
+						</view>
+						<view class="b">
+							<view class="name">
+								{{details.companyUser}}
+							</view>
+							<view class="p">
+								<span>鐢宠瘔涓婚锛�</span>
+								{{dictLabel1}}
+							</view>
+							<view class="p">
+								<span>鐢宠瘔鍐呭锛�</span>
+								{{details.complaintReason}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="jilu">
+					<image src="/static/guocheng.png" class="img" alt=""  />
+					<view class="font">
+						<view class="h">
+							<view class="s">
+								澶勭悊涓�
 							</view>
 							<view class="time">
 								2024-06-07 12:14
@@ -146,123 +178,97 @@
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="jilu">
-					<image src="/static/guocheng.png" class="img" alt=""  />
-					<view class="font">
-						<view class="h">
-							<view class="s">
-								澶勭悊涓�
-							</view>
-							<view class="time">
-								2024-06-07 12:14
-							</view>
-						</view>
-						<view class="b">
-							<view class="name">
-								{{details.companyUser}}
-							</view>
-							<view class="p">
-								<span>鐢宠瘔涓婚锛�</span>
-								{{dictLabel1}}
-							</view>
-							<view class="p">
-								<span>鐢宠瘔鍐呭锛�</span>
-								{{details.complaintReason}}
-							</view>
-						</view>
-					</view>
 				</view>
-			 -->
+			 -->
 			</view>
 		</view>
 		
 	</view>
 </template>
 
-<script>
-	import { complaintDetails, orderNodeList, orderComplaintNodeList } from '@/api/qiye.js'
-	import { orderDetails } from '@/api/policy.js'
-	import { config } from '@/common/config.js'
+<script>
+	import { complaintDetails, orderNodeList, orderComplaintNodeList } from '@/api/qiye.js'
+	import { orderDetails } from '@/api/policy.js'
+	import { config } from '@/common/config.js'
 	import { getDicts } from '@/api/data.js'
 	export default {
 		data() {
 			return {
-				details: {},
-				orderId: "",
-				orderDetailsMsg: {},
-				baseUrl: config.baseUrl,
-				dictLabel: "",
-				dictLabel1: "",
+				details: {},
+				orderId: "",
+				orderDetailsMsg: {},
+				baseUrl: config.baseUrl,
+				dictLabel: "",
+				dictLabel1: "",
 				nodeList: []
 			}
-		},
-		onLoad(options) {
-			this.complaint(options.id)
-			if(options.orderId) {
-				this.orderId = options.orderId
-				this.orderDetails()
-			} else {
-				this.orderNodeList(options.id)
-			}
 		},
-		methods: {
-			orderNodeList(id) {
-				orderNodeList({id}).then(val => {
-					// console.log(val)
-					this.nodeList = val.data.data
-				})
-			},
-			// 鑾峰彇鎶曡瘔绫诲瀷
-			getComtype() {
-				getDicts('complaint_type').then(val => {
-					console.log(val)
-					this.dictLabel1 = val.data.data.find(item => item.dictCode == this.details.complaintType).dictLabel
-					
-				})
-			},
-			enforceType() {
-				getDicts('enforce_type').then(val => {
-					console.log(val)
-					this.dictLabel = val.data.data.find(item => item.dictCode == this.orderDetailsMsg.enforceType).dictLabel
-					
-				})
+		onLoad(options) {
+			this.complaint(options.id)
+			if(options.orderId) {
+				this.orderId = options.orderId
+				this.orderDetails()
+			} else {
+				this.orderNodeList(options.id)
+			}
+		},
+		methods: {
+			orderNodeList(id) {
+				orderNodeList({id}).then(val => {
+					// console.log(val)
+					this.nodeList = val.data.data
+				})
 			},
-			imgclick(url) {
+			// 鑾峰彇鎶曡瘔绫诲瀷
+			getComtype() {
+				getDicts('complaint_type').then(val => {
+					console.log(val)
+					this.dictLabel1 = val.data.data.find(item => item.dictCode == this.details.complaintType).dictLabel
+					
+				})
+			},
+			enforceType() {
+				getDicts('enforce_type').then(val => {
+					console.log(val)
+					this.dictLabel = val.data.data.find(item => item.dictCode == this.orderDetailsMsg.enforceType).dictLabel
+					
+				})
+			},
+			imgclick(url) {
 				url = this.baseUrl + url
 				uni.previewImage({
 					urls: [url]
 				})
-			},
-			complaint(details) {
-				complaintDetails(details).then(val => {
-					// console.log(val.data.data)
-					this.details = val.data.data
-					this.getComtype()
-				})
-			},
-			orderDetails() {
-				orderDetails({ orderId: this.orderId}).then(val => {
-					// console.log(val.data.data)
-					val.data.data.regionImgs = val.data.data.regionImgs.split(",")
-					this.orderDetailsMsg = val.data.data
-					this.orderComplaintNodeList()
-					this.enforceType()
-				})
-			},
-			orderComplaintNodeList() {
-				orderComplaintNodeList({ orderId: this.orderId }).then(val => {
-					console.log(val.data.data, 'val===')
-					this.nodeList = val.data.data
-				})
+			},
+			complaint(details) {
+				complaintDetails(details).then(val => {
+					// console.log(val.data.data)
+					this.details = val.data.data
+					this.getComtype()
+				})
+			},
+			orderDetails() {
+				orderDetails({ orderId: this.orderId}).then(val => {
+					// console.log(val.data.data)
+					val.data.data.regionImgs = val.data.data.regionImgs.split(",")
+					this.orderDetailsMsg = val.data.data
+					this.orderComplaintNodeList()
+					this.enforceType()
+				})
+			},
+			orderComplaintNodeList() {
+				orderComplaintNodeList({ orderId: this.orderId }).then(val => {
+					console.log(val.data.data, 'val===')
+					this.nodeList = val.data.data
+				})
 			}
 		}
 	}
 </script>
 
 <style>
-	page {
-		background: #F4F4F4;
+	page {
+		background: #F4F4F4;
 	}
 </style>
 <style lang="scss" scoped>
@@ -335,7 +341,8 @@
 		border-radius: 5px;
 		box-sizing: border-box;
 		margin: 0 32rpx;
-	
+		position: relative;
+		z-index: 10;
 		.t {
 			padding: 24rpx;
 			border-bottom: 1px solid #EEEEEE;
@@ -344,33 +351,33 @@
 			font-weight: bold;
 		}
 	
-	}
+	}
 
 	.jilu{
 		display: flex;
 		justify-content: space-between;
-		padding: 24rpx;
-		position: relative;
-		&::before{
-			content: '';
-			display: inline-block;
-			width: 2rpx;
-			height: 100%;
-			background: #eb47460d;
-			position: absolute;
-			left: 44rpx;
-			top: 30rpx;
-			z-index: 99;
-		}
+		padding: 24rpx;
+		position: relative;
+		&::before{
+			content: '';
+			display: inline-block;
+			width: 2rpx;
+			height: 100%;
+			background: #eb47460d;
+			position: absolute;
+			left: 44rpx;
+			top: 30rpx;
+			z-index: 99;
+		}
 		
 		.img{
 			width: 50rpx;
 			height: 50rpx;
-			margin-right: 24rpx;
-			position: relative;
+			margin-right: 24rpx;
+			position: relative;
 			z-index: 100;
 		}
-		.font{
+		.font{
 			width: calc(100% - 70rpx);
 			.h{
 				display: flex;
@@ -406,20 +413,20 @@
 				}
 			}
 		}
-	}
-	.handler{
-		&::before {
-			background: #fe7b320d;
-		}
-	}
-	.start{
-		&::before{
-			background: #E7F8F0;
-		}
-	}
-	.nonde{
-		&::before{
-			background: none;
-		}
-	}
+	}
+	.handler{
+		&::before {
+			background: #fe7b320d;
+		}
+	}
+	.start{
+		&::before{
+			background: #E7F8F0;
+		}
+	}
+	.nonde{
+		&::before{
+			background: none;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1