From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:55:46 +0800
Subject: [PATCH] 修改
---
src/views/specialWorkManage/workTicket/allApplys/index.vue | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/allApplys/index.vue b/src/views/specialWorkManage/workTicket/allApplys/index.vue
index cd8e963..b5adbad 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/index.vue
@@ -75,8 +75,11 @@
</el-dialog>
<el-dialog :visible.sync="dialogStatus" title="作业申请进度" width="60%">
<el-form style="margin-bottom: 40px">
- <el-form-item label="申请作业人">
+ <el-form-item label="作业人" v-if="approveInfo.operatorUnames">
<el-input v-model="approveInfo.operatorUnames" readonly type="textarea" />
+ </el-form-item>
+ <el-form-item label="作业人" v-else>
+ <el-input placeholder="无" readonly type="textarea" />
</el-form-item>
</el-form>
<div style="display: flex; flex-direction: column-reverse">
@@ -103,7 +106,7 @@
><span>{{ i.resultDesc }}</span>
</div>
</div>
- <div class="approveItem">
+ <div class="approveItem" v-if="item.stepItems && item.stepItems.length>0">
<div class="item-tit">
<span>审批项目</span>
<!-- <span>类型</span>-->
@@ -112,7 +115,7 @@
<div class="item-cont" v-for="i in item.stepItems">
<span>{{ i.itemName }}</span>
<!-- <span>{{ i.typeDesc }}</span>-->
- <div v-if="i.measure !== null">
+ <div v-if="i.measure">
<div>
<span>作业类型：</span><span>{{ i.measure.workTypeDesc }}</span>
</div>
@@ -120,7 +123,7 @@
<span>措施内容：</span><span>{{ i.measure.context }}</span>
</div>
</div>
- <div v-if="i.stand !== null">
+ <div v-if="i.stand">
<div>
<span>标题名称：</span><span>{{ i.stand.title }}</span>
</div>
@@ -312,7 +315,7 @@
} else {
this.$message({
type: 'warning',
- message: res.data.msg
+ message: res.data.msg || '导出失败'
});
}
})
@@ -370,6 +373,7 @@
let res = await workApplyApi().getAllStatus(data);
if (res.data.code === '200') {
this.approveInfo = JSON.parse(JSON.stringify(res.data.data));
+ console.log(this.approveInfo,'this.approveInfo')
// this.approveInfo.operators = this.approveInfo.operators.map(item => {
// return item.operatorUname
// }).join('、')
@@ -391,15 +395,15 @@
this.dialogType = row.workType
this.details = JSON.parse(JSON.stringify(row));
this.details.operators = this.details.operators.join('、')
- if(this.details.workDetail.otherSpecialWork == '' || !this.details.workDetail.otherSpecialWork){
- this.details.workDetail.otherSpecialWork = ''
- }
- else {
- const a = this.details.workDetail.otherSpecialWork
- this.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
- return this.workType.find((i) => i.id === Number(item)).name;
- }).join('、');
- }
+ // if(this.details.workDetail.otherSpecialWork == '' || !this.details.workDetail.otherSpecialWork){
+ // this.details.workDetail.otherSpecialWork = ''
+ // }
+ // else {
+ // const a = this.details.workDetail.otherSpecialWork
+ // this.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
+ // return this.workType.find((i) => i.id === Number(item)).name;
+ // }).join('、');
+ // }
if(this.details.workDetail.involvedDepIds == '' || !this.details.workDetail.involvedDepIds){
this.details.workDetail.involvedDepIds = ''
}
--
Gitblit v1.9.2