From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
index 4b65d15..3cc4206 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
@@ -23,7 +23,7 @@
<el-input v-model="details.workContent" readonly type="textarea" />
</el-form-item>
<el-form-item label="作业地址">
- <el-input v-model="details.workLocation" readonly type="textarea" />
+ <el-input v-model="details.workLocation" readonly type="textarea"/>
</el-form-item>
<el-form-item label="受限空间所属单位">
<el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
@@ -34,6 +34,18 @@
<el-form-item label="空间原有介质名称">
<el-input v-model="details.workDetail.csOriginalName" readonly type="textarea" />
</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" />
</el-form-item>
--
Gitblit v1.9.2