From 0a24ffeb3eff074c8f11e9f94fdf2c2cb4929799 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 10 Nov 2023 13:08:29 +0800
Subject: [PATCH] fix:小程序详情修改

---
 pages/actionChange/workOrderDetails/index.vue |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue
index de61d5b..550a248 100644
--- a/pages/actionChange/workOrderDetails/index.vue
+++ b/pages/actionChange/workOrderDetails/index.vue
@@ -2,10 +2,10 @@
 	<view class="mainContent">
 		<basicInfor :basic-infor="basicInfor" v-if="isShow" />
 		<rectificationInfor ref="rectificationInfor" :basic-infor="basicInfor"
-			v-if="!(pageState === 'view' && basicInfor.state === 20)" />
-		<approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30 && basicInfor.stateName!=='���������'"
+			v-if="!(pageState === 'view' && basicInfor.state === 20)&&isShow" />
+		<approvalnfor ref="approvalnfor" v-if="basicInfor.state >= 30 && basicInfor.stateName!=='���������' && isShow"
 			:basic-infor="basicInfor" />
-		<view class="bunts">
+		<view class="bunts" v-if="isShow">
 			<view class="but butRight">
 				<u-button shape="square" @click="refuse" type="error"
 					v-if="pageState==='edit'&& basicInfor.state >= 30">������</u-button>
@@ -34,7 +34,7 @@
 				basicInfor: {},
 				unitListL: [],
 				userInfor: null,
-				show: false,
+				show: true,
 				isShow: false,
 				option: {}
 			}
@@ -47,7 +47,7 @@
 		created() {
 			this.getUnitList()
 		},
-		onLoad: function(option) {
+		onLoad(option) {
 			//option���object������������������������������������������������
 			this.basicInfor = JSON.parse(option.infor)
 			// let type = JSON.parse(option.type)
@@ -55,8 +55,8 @@
 			this.option = option
 		},
 		async mounted() {
-			//������������������ 
 			await this.$onLaunched
+			//������������������ 
 			this.userInfor = JSON.parse(uni.getStorageSync('userInfor') || 'null')
 			console.log('������������������������', this.userInfor)
 			if (this.option.type === 'share' && this.userInfor) {
@@ -83,12 +83,12 @@
 						// ������������
 						this.basicInfor.pageState = 'edit'
 						this.basicInfor.stateName = res.data.name
-						this.isShow = true
+						this.getData()
 					} else if (res.data.code === 2) {
 						// ���������
-						this.isShow = true
 						this.basicInfor.pageState = 'view'
 						this.basicInfor.stateName = res.data.name
+						this.getData()
 					}
 				}).catch(errors => {
 					console.log('���������������������', errors)
@@ -96,11 +96,23 @@
 				})
 			} else {
 				this.isShow = true
+				this.getData()
 			}
 			console.log('this.basicInfor123', this.basicInfor)
 		},
 		methods: {
-			closePop() {},
+			getData() {
+				this.$http.httpGet('/allocation/detail', {
+					id: this.basicInfor.allocationId
+				}).then(res => {
+					this.isShow = true
+					this.show = false
+					this.basicInfor = {
+						...this.basicInfor,
+						...res.data
+					}
+				})
+			},
 			getUnitList() {
 				this.$http.httpGet('/allocation/unit').then(res => {
 					this.unitList = res.data

--
Gitblit v1.8.0