From 4bced4c45dac14f20953b6f3b0326e535a99729b Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 23 Nov 2023 09:48:03 +0800
Subject: [PATCH] fix:导出修改
---
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
index d61fbb2..6437d59 100644
--- a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
@@ -7,7 +7,7 @@
</div>
<div>
<div v-if="dialogData.pageType !=='delay'" class="stepsList">
- <el-steps :space="200" :active="parentFormData.approveList.length+1" align-center>
+ <el-steps :space="200" :active="activeLeng" align-center>
<el-step v-for="(item,index) in setepList" :key="index" :title="'' + item.createName + ' ' + item.stateName" :description="item.createTime" />
</el-steps>
</div>
@@ -23,7 +23,7 @@
</el-descriptions>
<el-descriptions :column="parseInt('2')">
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ parentFormData.pollutePosition }}</el-descriptions-item>
- <el-descriptions-item label="������������" label-class-name="itemSpan">{{ dictObj.emphasisEnum[parentFormData.keyPoint] }}</el-descriptions-item>
+ <el-descriptions-item label="������������" label-class-name="itemSpan">{{ dictObj.emphasisEnum[parentFormData.keyPoint] }}</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="parseInt('1')">
<el-descriptions-item label="������������" label-class-name="itemSpan" :content-style="{'width': '80%'}">{{ parentFormData.problemDescribe }}</el-descriptions-item>
@@ -46,8 +46,8 @@
<div style="display: flex;">
<el-form-item label="������������:">
<el-radio-group v-model="workForme.isChange">
- <el-radio :label="0">���</el-radio>
- <el-radio :label="1">���</el-radio>
+ <el-radio :label="1">���</el-radio>
+ <el-radio :label="0">���</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="���������:">
@@ -72,7 +72,7 @@
<el-col :span="12">
<div class="grid-content bg-purple" />
<el-descriptions title="������������" :column="parseInt('2')">
- <el-descriptions-item label="������������" label-class-name="itemSpan">{{ parentFormData.changeType }}</el-descriptions-item>
+ <el-descriptions-item label="������������" label-class-name="itemSpan">{{ dictObj.yesOrNo[parentFormData.isChange] }}</el-descriptions-item>
<el-descriptions-item label="���������" label-class-name="itemSpan">{{ parentFormData.changeName }}</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="parseInt('1')">
@@ -195,6 +195,8 @@
</el-form>
</div>
</div>
+ <el-alert v-if="parentFormData.isInvalid===1" title="���������" type="warning" show-icon :description="`���������${parentFormData.invalidReason}`" :closable="false">
+ </el-alert>
<div slot="footer" class="dialog-footer">
<el-button @click="close()">������</el-button>
<el-button v-if="dialogData.pageType ==='approve'" type="danger" @click="handleSubmit(50)">������</el-button>
@@ -270,7 +272,8 @@
fileDelayListCover: [],
fileDelayList: [],
videoVisible: false,
- dialogImageUrl: ''
+ dialogImageUrl: '',
+ activeLeng: 1
}
},
computed: {
@@ -306,17 +309,20 @@
setepList() {
const leng = this.dialogData.parentFormData.approveList.length
let data = _.cloneDeep(this.dialogData.parentFormData.approveList)
-
+ console.log('setepList', this.dialogData.parentFormData.approveList)
if (leng === 1) {
data = [...data, ...this.setepListAdd.set1]
+ this.activeLeng = 1
}
if (leng === 2) {
data = [...data, ...this.setepListAdd.set2]
+ this.activeLeng = 2
}
if (leng === 3) {
data = [...data, ...this.setepListAdd.set3]
+ this.activeLeng = 4
}
- console.log('data', leng)
+ console.log('datadata', data)
return data
}
},
--
Gitblit v1.8.0