From 6d21dd8cdb40c6734c90f6a4a180cc00bae53e20 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 08:39:43 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue | 18 +++++++++++++-----
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 2 +-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
index 00edb41..a1d1467 100644
--- a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
@@ -75,8 +75,8 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="���������������������" prop="keyPoint" class="span">
- <el-checkbox-group v-model="formData.keyPoint" :max="1" size="small">
+ <el-form-item label="���������������" prop="keyPointlist" class="span">
+ <el-checkbox-group v-model="formData.keyPointlist" :max="1" size="small" @change='changeKeyPoint'>
<el-checkbox v-for="item in Dic.emphasisEnum" :label="item.value" :key="item.value">{{ item.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
@@ -144,7 +144,7 @@
escalationTime: new Date(),
fileBaseList: [],
escalationName: '',
- keyPoint: [],
+ keyPointlist: [],
changeDay: 0,
investigationType: 1
},
@@ -244,6 +244,9 @@
})
},
methods: {
+ changeKeyPoint(data) {
+ this.$forceUpdate()
+ },
getPreviewImages(index, list) {
let startIndex = 0
const chechList = _.cloneDeep(list)
@@ -296,7 +299,7 @@
if (!(JSON.stringify(this.parentFormData) === '{}')) {
this.formData = this.parentFormData
this.formData.polluteType = String(this.parentFormData.polluteType)
- this.formData.keyPoint = this.parentFormData.keyPoint
+ this.formData.keyPointlist = this.parentFormData.keyPoint
? [Number(this.parentFormData.keyPoint)]
: []
} else {
@@ -327,7 +330,9 @@
}
this.formData.state = val
this.formData.keyPoint =
- this.formData.keyPoint.length > 0 ? this.formData.keyPoint[0] : ''
+ this.formData.keyPointlist.length > 0
+ ? this.formData.keyPointlist[0]
+ : ''
this.$refs.ruleForm.validate(valid => {
if (valid) {
// this.formData.fileBaseList = [...this.parentFormData.fileBaseList, this.formData.fileBaseList]
@@ -383,4 +388,7 @@
}
}
}
+/deep/.el-checkbox__inner {
+ border-radius: 50%;
+}
</style>
diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
index d61fbb2..8dcd8b8 100644
--- a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
@@ -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>
--
Gitblit v1.8.0