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/spaceLog.vue | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue index 3cc4206..d6b4606 100644 --- a/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue +++ b/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue @@ -34,16 +34,19 @@ <el-form-item label="空间原有介质名称"> <el-input v-model="details.workDetail.csOriginalName" 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="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-column prop="bigClassifyName" label="物资类型" align="center"/> + <el-table-column prop="materialName" label="物资名称" align="center"/> + <el-table-column prop="configurationLevel" label="配置级别" align="center"> + <template #default="scope"> + {{scope.row.configurationLevel == 0?'必选':(scope.row.configurationLevel == 1? '可选':'高配')}} + </template> + </el-table-column> + <el-table-column prop="useCount" label="配置数量" align="center"/> </el-table> </el-form-item> <el-form-item label="关联其他作业"> -- Gitblit v1.9.2