From 3c738f4fe2762bba8087e5a22fc0dc06560eab0e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 10:01:17 +0800
Subject: [PATCH] 三色任务与自查任务

---
 subPackage/workbench/views/labelReportDetail.vue |   78 +++++++++++++++++++++++---------------
 1 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/subPackage/workbench/views/labelReportDetail.vue b/subPackage/workbench/views/labelReportDetail.vue
index 944b721..b4a8b3c 100644
--- a/subPackage/workbench/views/labelReportDetail.vue
+++ b/subPackage/workbench/views/labelReportDetail.vue
@@ -34,24 +34,13 @@
 				<text class="row-right">{{remark}}</text>
 			</view>
 
-			<!-- <view class="info">
-				<u-form labelWidth="70" :model="form" ref="form" class="form">
-					<u-form-item label="审核状态" @click="showPicker()" class="form-item" :border-bottom="true">
-						<u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
-							:border="false"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-					<u-form-item label="备注" class="form-item" v-if="selectStatus == 3">
-						<u--input type="textarea" v-model="remark"></u--input>
-					</u-form-item>
-				</u-form>
-			</view> -->
+
 		</view>
-		<!-- <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
-			<u-button type="primary" @click="submit">提交审核</u-button>
-		</view> -->
+
 		<footer-btn v-if="roleType ==2 && status == 3" text="重新编辑" @click="navToEdit"></footer-btn>
-		<audit-action @handle="submit" v-if="roleType == 1 && status == 1"></audit-action>
+
+
+		<audit-action :dataItem="info" @handle="submit" v-if="roleType == 1 && status == 1"></audit-action>
 
 		<u-picker :defaultIndex="defaultIndex" :closeOnClickOverlay="true" @close="isPickerShow = false"
 			:show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false"
@@ -77,9 +66,28 @@
 		},
 		data() {
 			return {
+				info: {
+					type: 1,
+					status: 1,
+				},
 				basicData: [{
-						label: '对象电话',
-						name: "transactionObjectTel",
+						label: '物品名称',
+						name: "transactionObject",
+						value: '未完善'
+					},
+					{
+						label: '交易人姓名',
+						name: "owner",
+						value: '未完善'
+					},
+					{
+						label: '交易人电话',
+						name: "phoneNumber",
+						value: '未完善'
+					},
+					{
+						label: '交易人身份证',
+						name: "idCard",
 						value: '未完善'
 					},
 					{
@@ -100,6 +108,11 @@
 					{
 						label: '交易过程',
 						name: 'transactionProcess',
+						value: '未完善'
+					},
+					{
+						label: '时间',
+						name: 'createTime',
 						value: '未完善'
 					}
 				],
@@ -139,17 +152,18 @@
 		},
 		onLoad(option) {
 			this.taskId = option.id;
-			this.getDetailInfo(option.id);
-
 			let roleName = uni.getStorageSync("activeRole").roleName
 			if (roleName == "居民") {
 				this.roleType = 2;
-
 			} else {
 				this.roleType = 1
 			}
-
 		},
+
+		onShow() {
+			this.getDetailInfo();
+		},
+
 
 		methods: {
 
@@ -170,9 +184,9 @@
 				}
 			},
 
-			getDetailInfo(id) {
+			getDetailInfo() {
 				getLabelReportingDetail({
-					taskId: id
+					taskId: this.taskId
 				}).then(res => {
 					console.log(res);
 					let data = res.data;
@@ -181,17 +195,19 @@
 							title: `${data.labelName}详情`
 						})
 					}
-
-
 					this.id = data.id;
 					this.status = data.confirmFlag;
 					this.remark = data.confirmNotion;
 					this.getIndex(data.confirmFlag)
 					this.basicData.forEach(item => {
-						item.value = data[item.name]
+						item.value = data[item.name] || "未完善"
 					})
-					// this.imageUrls = this.setImages(data.imageUrls);
-					// this.goodsImageUrls = this.setImages(data.goodsImageUrls);
+					this.info.labelName = data.labelName
+					this.info.transactionObject = data.transactionObject
+					this.info.id = this.taskId
+					this.info.status = data.confirmFlag
+					this.info.houseCode = data.houseCode
+					console.log("********0", this.info)
 					this.imageUrls = this.$setImageUrl(data.imageUrls);
 					this.goodsImageUrls = this.$setImageUrl(data.goodsImageUrls)
 				})
@@ -217,7 +233,7 @@
 					// status: this.selectStatus,
 					status: val.type,
 					// remark: this.remark
-					remark: val.remark
+					confirmNotion: val.remark
 				}
 				// if (this.selectStatus == 3 && !this.remark) {
 				// 	uni.showToast({
@@ -253,7 +269,7 @@
 
 			navToEdit() {
 				uni.navigateTo({
-					url: `/subPackage/label/form?id=${this.id}`
+					url: `/subPackage/label/form?id=${this.taskId}`
 				})
 			}
 

--
Gitblit v1.9.3