From 618dec29866fdae7d602fc1c14c881d7295a6f1e Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 16 Nov 2023 14:25:40 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
index f1c3aa0..0521100 100644
--- a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
@@ -12,7 +12,7 @@
</el-steps>
</div>
<div class="inforData">
- <el-descriptions title="������������">
+ <el-descriptions title="������������" :column="parseInt('4')">
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ parentFormData.escalationTime }}</el-descriptions-item>
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ unitIdFormatter }}</el-descriptions-item>
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ polluteTypeFormatter }}</el-descriptions-item>
@@ -20,7 +20,10 @@
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ parentFormData.changeDay }}</el-descriptions-item>
<el-descriptions-item label="������������" label-class-name="itemSpan">{{ updataUnitIdFormatter }}</el-descriptions-item>
<el-descriptions-item label="���������" label-class-name="itemSpan">{{ parentFormData.escalationName }}</el-descriptions-item>
+ </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>
<el-descriptions :column="parseInt('1')">
<el-descriptions-item label="������������" label-class-name="itemSpan" :content-style="{'width': '80%'}">{{ parentFormData.problemDescribe }}</el-descriptions-item>
@@ -43,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="���������:">
@@ -69,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')">
@@ -192,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>
--
Gitblit v1.8.0