From e126770f6dd3e3d37ff61559c9b691ad9a1abc09 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 23 十二月 2022 15:35:08 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsqjl/index.vue | 19 ++++++---
src/views/specialWorkSystem/workTicket/wdsq/components/plateLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/components/powerLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/components/hoistLog.vue | 5 ++
src/views/specialWorkSystem/process/zyjcgl/index.vue | 26 ++++++++----
src/views/specialWorkSystem/workTicket/wdsq/components/groundLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/index.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/components/brokenLog.vue | 5 ++
src/views/specialWorkSystem/workTicket/wdsq/components/heightLog.vue | 5 ++
11 files changed, 66 insertions(+), 24 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">
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/brokenLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/brokenLog.vue
index 3666db3..b32213d 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/brokenLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/brokenLog.vue
@@ -40,7 +40,10 @@
<el-form-item label="图片">
<el-image v-for="item in details.workDetail.bcPath" :preview-src-list="details.workDetail.bcPath" style="width: 150px; height: 150px;margin-right: 50px;margin-bottom: 20px" :src="item" fit="cover" />
</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.length>0">
<el-table :data="details.workMaterial" style="width: 100%" border>
<el-table-column prop="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
index c5059b7..6386a7e 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/fireLog.vue
@@ -28,7 +28,10 @@
<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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/groundLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/groundLog.vue
index 07a65c4..ed728d7 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/groundLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/groundLog.vue
@@ -34,7 +34,10 @@
<el-form-item label="动土方式">
<el-input v-model="details.workDetail.gbMethod" 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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/heightLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/heightLog.vue
index 96f5a45..f95c6e9 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/heightLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/heightLog.vue
@@ -31,7 +31,10 @@
<el-form-item label="作业高度">
<el-input v-model="details.workDetail.operationHeight" readonly type="textarea"><template #append>米(m)</template></el-input>
</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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/hoistLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/hoistLog.vue
index 84f4994..1086537 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/hoistLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/hoistLog.vue
@@ -31,7 +31,10 @@
<el-form-item label="起吊物体重量">
<el-input v-model="details.workDetail.weightMass" readonly type="textarea"><template #append>吨(t)</template></el-input>
</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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/plateLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/plateLog.vue
index 94854dc..69620a3 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/plateLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/plateLog.vue
@@ -52,7 +52,10 @@
<el-form-item label="拆盲板时间">
<el-input v-model="details.workDetail.uninstallBpTime" readonly/>
</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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/powerLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/powerLog.vue
index acce54f..cf81c13 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/powerLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/powerLog.vue
@@ -34,7 +34,10 @@
<el-form-item label="用电设备及功率">
<el-input v-model="details.workDetail.equipmentAndPower" 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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue b/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue
index f08f3d3..d6b4606 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/components/spaceLog.vue
@@ -34,7 +34,10 @@
<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="bigClassifyName" label="物资类型" align="center"/>
<el-table-column prop="materialName" label="物资名称" align="center"/>
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/index.vue b/src/views/specialWorkSystem/workTicket/wdsq/index.vue
index 91206f2..340b902 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/index.vue
@@ -38,6 +38,11 @@
<el-table-column property="operators" label="作业人" />
<el-table-column property="workTypeDesc" label="作业类型" />
<el-table-column property="workLevelDesc" label="作业等级" />
+ <el-table-column property="materialStatus" label="物资状态" align="center" width="180">
+ <template #default="scope">
+ <span>{{ scope.row.materialStatus==0?'未关联物资':(scope.row.materialStatus==1?'必选物资配备不足':(scope.row.materialStatus==2?'必选物资配备齐全':(scope.row.materialStatus==3?'物资配置专业':(scope.row.materialStatus==4?'物资配置高端':'-')))) }}</span>
+ </template>
+ </el-table-column>
<el-table-column property="applyTime" label="申请时间" width="180" />
<el-table-column label="申请状态" align="center" width="180">
<template #default="scope">
diff --git a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
index 2446c26..9bf63b3 100644
--- a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
@@ -51,13 +51,18 @@
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="applyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
- <el-table-column property="workPermitNo" label="作业申请单号" width="180" />
- <el-table-column property="applyUname" label="申请人" />
- <el-table-column property="depName" label="部门名称" />
- <el-table-column property="operators" label="作业人" />
- <el-table-column property="workTypeDesc" label="作业类型" />
- <el-table-column property="workLevelDesc" label="作业等级" />
- <el-table-column property="applyTime" label="申请时间" width="180" />
+ <el-table-column property="workPermitNo" label="作业申请单号" width="180" align="center"/>
+ <el-table-column property="applyUname" label="申请人" align="center"/>
+ <el-table-column property="depName" label="部门名称" align="center"/>
+ <el-table-column property="operators" label="作业人" align="center"/>
+ <el-table-column property="workTypeDesc" label="作业类型" align="center"/>
+ <el-table-column property="workLevelDesc" label="作业等级" align="center"/>
+ <el-table-column property="materialStatus" label="物资状态" align="center" width="180">
+ <template #default="scope">
+ <span>{{ scope.row.materialStatus==0?'未关联物资':(scope.row.materialStatus==1?'必选物资配备不足':(scope.row.materialStatus==2?'必选物资配备齐全':(scope.row.materialStatus==3?'物资配置专业':(scope.row.materialStatus==4?'物资配置高端':'-')))) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column property="applyTime" label="申请时间" width="180" align="center"/>
<el-table-column label="申请状态" align="center" width="180">
<template #default="scope">
<el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
--
Gitblit v1.9.2