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/spaceLog.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
index e104833..3cc4206 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/components/spaceLog.vue
@@ -23,9 +23,9 @@
<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="受限空间所属单位ID">
+ <el-form-item label="受限空间所属单位">
<el-input v-model="details.workDetail.csDepId" readonly type="textarea" />
</el-form-item>
<el-form-item label="受限空间名称">
@@ -33,6 +33,18 @@
</el-form-item>
<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" />
@@ -75,16 +87,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