From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
index feb4040..6386a7e 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
@@ -28,16 +28,19 @@
<el-form-item label="作业方式">
<el-input v-model="details.workDetail.hotMethod" readonly type="textarea" />
</el-form-item>
- <el-form-item label="关联物资">
+ <el-form-item label="物资状态">
+ <span>{{ details.materialStatus==0?'未关联物资':(details.materialStatus==1?'必选物资配备不足':(details.materialStatus==2?'必选物资配备齐全':(details.materialStatus==3?'物资配置专业':(details.materialStatus==4?'物资配置高端':'-')))) }}</span>
+ </el-form-item>
+ <el-form-item label="关联物资" v-if="details.workMaterial&&details.workMaterial.length>0">
<el-table :data="details.workMaterial" style="width: 100%" border>
- <el-table-column prop="materialTypeName" label="物资类型" align="center"/>
+ <el-table-column prop="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
- <el-table-column prop="consumables" label="是否耗材" align="center">
+ <el-table-column prop="configurationLevel" label="配置级别" align="center">
<template #default="scope">
- {{scope.row.consumables?'耗材':'非耗材'}}
+ {{scope.row.configurationLevel == 0?'必选':(scope.row.configurationLevel == 1? '可选':'高配')}}
</template>
</el-table-column>
- <el-table-column prop="defaultVal" label="配置数量" align="center"/>
+ <el-table-column prop="useCount" label="配置数量" align="center"/>
</el-table>
</el-form-item>
<el-form-item label="关联其他作业">
--
Gitblit v1.9.2