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/process/zyjcgl/index.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/views/specialWorkSystem/process/zyjcgl/index.vue b/src/views/specialWorkSystem/process/zyjcgl/index.vue
index fda4558..7398d60 100644
--- a/src/views/specialWorkSystem/process/zyjcgl/index.vue
+++ b/src/views/specialWorkSystem/process/zyjcgl/index.vue
@@ -38,19 +38,24 @@
height="calc(100% - 100px)"
:header-cell-style="{background: '#fafafa'}"
>
- <el-table-column type="index" label="序号" width="80"/>
- <el-table-column property="workPermitNo" label="作业证编号"/>
- <el-table-column property="workTypeDesc" label="作业类型"/>
- <el-table-column property="checkContent" label="检查内容"/>
- <el-table-column property="checkResultDesc" label="检查结果">
+ <el-table-column type="index" label="序号" width="80" align="center"/>
+ <el-table-column property="workPermitNo" label="作业证编号" align="center"/>
+ <el-table-column property="workTypeDesc" label="作业类型" align="center"/>
+ <el-table-column property="checkContent" label="检查内容" align="center"/>
+ <el-table-column property="checkResultDesc" label="检查结果" align="center">
<template #default="scope">
<span :class="scope.row.checkResultDesc == '异常' ? 'red': ''">{{ scope.row.checkResultDesc}}</span>
</template>
</el-table-column>
- <el-table-column property="info" label="描述" show-overflow-tooltip width="200"/>
- <el-table-column property="operatorUname" label="分析人"/>
- <el-table-column property="operationTime" label="分析时间" width="180"/>
- <el-table-column fixed="right" label="操作" align="center" width="250">
+ <el-table-column property="info" label="描述" show-overflow-tooltip width="200" align="center"/>
+ <el-table-column property="operatorUname" label="分析人" align="center"/>
+ <el-table-column property="operationTime" label="分析时间" width="180" align="center"/>
+ <el-table-column property="mcResultName" label="物资检查" width="180" align="center">
+ <template #default="scope">
+ <span :class="scope.row.mcResultName == '不合格' ? 'red': ''">{{ scope.row.mcResultName== null?'-':scope.row.mcResultName}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="操作" align="center" width="100">
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
</template>
@@ -98,6 +103,9 @@
<el-form-item label="分析时间">
<el-input v-model="details.operationTime" readonly/>
</el-form-item>
+ <el-form-item label="物资检查">
+ <span>{{details.mcResultName== null?'-':details.mcResultName}}</span>
+ </el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
--
Gitblit v1.9.2