From ed0ef98553f6d2e34e147ad37b7781f77d2048e9 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 11 十月 2022 16:44:11 +0800
Subject: [PATCH] Default Changelist

---
 src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
index b96f9ef..ba57c56 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/heightLog.vue
@@ -1,6 +1,6 @@
 <template>
 	<div style="height: 100%">
-		<el-form :model="details" label-width="120px">
+		<el-form :model="details" label-width="150px">
 			<el-form-item label="作业申请单号">
 				<el-input v-model="details.workPermitNo" readonly />
 			</el-form-item>
@@ -25,11 +25,23 @@
 			<el-form-item label="作业地址">
 				<el-input v-model="details.workLocation" readonly type="textarea" />
 			</el-form-item>
-			<el-form-item label="作业单位ID">
+			<el-form-item label="作业单位">
 				<el-input v-model="details.workDetail.operationDepId" readonly type="textarea" />
 			</el-form-item>
 			<el-form-item label="作业高度">
 				<el-input v-model="details.workDetail.operationHeight" readonly type="textarea"><template #append>米(m)</template></el-input>
+			</el-form-item>
+			<el-form-item label="关联物资">
+				<el-table :data="details.workMaterial" style="width: 100%" border>
+					<el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+					<el-table-column prop="materialName" label="物资名称" align="center"/>
+					<el-table-column prop="consumables" label="是否耗材" align="center">
+						<template #default="scope">
+							{{scope.row.consumables?'耗材':'非耗材'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="defaultVal" label="配置数量" align="center"/>
+				</el-table>
 			</el-form-item>
 			<el-form-item label="关联其他作业">
 				<el-input v-model="details.workDetail.otherSpecialWork" readonly type="textarea"/>
@@ -72,16 +84,12 @@
 	export default defineComponent({
 		name: 'space',
 		components: {},
-		props:{
-			details: Object
-		},
-		setup(props) {
+		props:['details'],
+		setup() {
 			const userInfo = useUserInfo()
 			const { userInfos } = storeToRefs(userInfo);
-			const details1 = props.details
 			return {
-				Search,
-				details1
+				Search
 			};
 		},
 	});

--
Gitblit v1.9.2