From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Thu, 13 Oct 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
index f1aba23..5e1f2c7 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/groundLog.vue
@@ -25,7 +25,7 @@
<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="范围">
@@ -34,9 +34,24 @@
<el-form-item label="动土方式">
<el-input v-model="details.workDetail.gbMethod" 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>
+ <el-form-item label="图片">
+ <el-image v-for="item in details.workDetail.gbPath" :preview-src-list="details.workDetail.gbPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
+ </el-form-item>
<el-form-item label="期望开始时间">
<el-input v-model="details.expStartTime" readonly />
</el-form-item>
--
Gitblit v1.9.2