From 79406a48bdad7665d1bd5ebfd07ed2dcdcf4114b Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Tue, 14 Nov 2023 14:00:36 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/queryForm.vue | 11 +++++++----
src/views/toCarryOutLegislativeReforms/reform/index.vue | 4 ++--
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue | 39 ++++++++++++++++++++++++++++-----------
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 5 ++++-
4 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
index 23a9650..00edb41 100644
--- a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
@@ -6,7 +6,7 @@
<div>{{ title }}</div>
</div>
<div>
- <el-form ref="ruleForm" :disabled="pageState==='detail'" label-width="100px" :model="formData" class="demo-form-inline" :rules="rules">
+ <el-form ref="ruleForm" :disabled="pageState === 'detail'" label-width="120px" :model="formData" class="demo-form-inline" :rules="rules">
<el-row>
<el-col :span="12">
<el-form-item label="���������������" prop="escalationTime" class="span">
@@ -45,7 +45,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="���������������" prop="changeDay" class="span">
- <el-input-number v-model="formData.changeDay" :disabled="formData.changeType===1" :min="0" label="���������" />
+ <el-input-number v-model="formData.changeDay" :disabled="formData.changeType === 1" :min="0" label="���������" />
<!-- <el-input v-model.number="formData.changeDay" :disabled="formData.changeType===1" type="text" placeholder="���������" size="small" /> -->
</el-form-item>
</el-col>
@@ -68,8 +68,17 @@
<el-col :span="24">
<el-form-item label="���������������" prop="investigationType" class="span">
<el-radio-group v-model="formData.investigationType" size="small">
- <el-radio v-for="(item) in Dic.investigationEnum" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
+ <el-radio v-for="item in Dic.investigationEnum" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
</el-radio-group>
+ </el-form-item>
+ </el-col>
+ </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-checkbox v-for="item in Dic.emphasisEnum" :label="item.value" :key="item.value">{{ item.name }}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
@@ -81,29 +90,31 @@
<el-row>
<el-form-item label="���������">
<div>
- <div v-if="pageState==='edit'">
- <div v-for="(file,index) in fileBaseListCover" :key="file.fileId+index" class="block">
- <el-image v-if="file.fileType ===1" style="width: 100px; height: 100px" :src="file.url" :preview-src-list="getPreviewImages(file.fileId,fileBaseList)" :initial-index="index" />
+ <div v-if="pageState === 'edit'">
+ <div v-for="(file, index) in fileBaseListCover" :key="file.fileId + index" class="block">
+ <el-image v-if="file.fileType === 1" style="width: 100px; height: 100px" :src="file.url" :preview-src-list="
+ getPreviewImages(file.fileId, fileBaseList)
+ " :initial-index="index" />
<video v-else :src="file.url" style="width: 100px; height: 100px" @click="openVideo(file)">
������������������������ video ���������
</video>
</div>
</div>
</div>
- <uploadFile v-if="pageState!=='detail'" :upload-url="uploadTermExcelUrl" :sys-code="sysCode" />
+ <uploadFile v-if="pageState !== 'detail'" :upload-url="uploadTermExcelUrl" :sys-code="sysCode" />
</el-form-item>
</el-row>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="close">������</el-button>
- <el-button v-if="pageState!=='detail'" type="info" @click="handleSubmit('9')">������</el-button>
- <el-button v-if="pageState!=='detail'" type="primary" @click="handleSubmit('10')">������</el-button>
+ <el-button v-if="pageState !== 'detail'" type="info" @click="handleSubmit('9')">������</el-button>
+ <el-button v-if="pageState !== 'detail'" type="primary" @click="handleSubmit('10')">������</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="videoVisible" width="600px" :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
- <div style="text-align: center;">
- <video ref="video" style="width: 300px;height: 500px" :src="dialogImageUrl" controls autoplay />
+ <div style="text-align: center">
+ <video ref="video" style="width: 300px; height: 500px" :src="dialogImageUrl" controls autoplay />
</div>
</el-dialog>
</div>
@@ -133,6 +144,7 @@
escalationTime: new Date(),
fileBaseList: [],
escalationName: '',
+ keyPoint: [],
changeDay: 0,
investigationType: 1
},
@@ -284,6 +296,9 @@
if (!(JSON.stringify(this.parentFormData) === '{}')) {
this.formData = this.parentFormData
this.formData.polluteType = String(this.parentFormData.polluteType)
+ this.formData.keyPoint = this.parentFormData.keyPoint
+ ? [Number(this.parentFormData.keyPoint)]
+ : []
} else {
const name = this.$store.state.user.name
this.formData.escalationName = name
@@ -311,6 +326,8 @@
})
}
this.formData.state = val
+ this.formData.keyPoint =
+ this.formData.keyPoint.length > 0 ? this.formData.keyPoint[0] : ''
this.$refs.ruleForm.validate(valid => {
if (valid) {
// this.formData.fileBaseList = [...this.parentFormData.fileBaseList, this.formData.fileBaseList]
diff --git a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
index 509d71e..b2696ed 100644
--- a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -35,13 +35,13 @@
</el-select>
</el-form-item>
<el-form-item label="���������������">
- <el-select v-model="formData.state" size="small" clearable multiple collapse-tags placeholder="���������">
+ <el-select v-model="formData.state" size="small" clearable multiple collapse-tags placeholder="���������" @change="replacePerChange($event)">
<el-option v-for="item in Dic.allocationApproveEnum" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
- <el-select v-model="formData.isInvalid " placeholder="���������" clearable size="small">
+ <el-select v-model="formData.isInvalid " placeholder="���������" clearable size="small" @change="replacePerChange($event)">
<el-option v-for="item in Dic.yesOrNo" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
@@ -62,7 +62,8 @@
data() {
return {
formData: {
- isInvalid: null
+ isInvalid: 0,
+ state: [9, 20, 30]
},
unitList: [],
Dic: JSON.parse(localStorage.getItem('dict')),
@@ -84,7 +85,6 @@
method: 'get'
}).then(res => {
this.unitList = res.data
- this.formData.isInvalid = 0
})
},
getContaminateList() {
@@ -95,6 +95,9 @@
this.polluteList = res.data
})
},
+ replacePerChange(val) {
+ this.$forceUpdate()
+ },
onSubmit() {
console.log('formData', this.formData)
this.$emit('handleSearch', this.formData)
diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
index f1c3aa0..d61fbb2 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>
diff --git a/src/views/toCarryOutLegislativeReforms/reform/index.vue b/src/views/toCarryOutLegislativeReforms/reform/index.vue
index b443b7e..8d9a4db 100644
--- a/src/views/toCarryOutLegislativeReforms/reform/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -203,7 +203,7 @@
// ������������������������������������������(���������������������������)
totalCount: 0,
// ������������������������������
- pageSizes: [10, 20, 30, 40],
+ pageSizes: [10, 30, 60, 100],
// ������������������������������������������
pageSize: 10
},
@@ -459,7 +459,7 @@
// ������������������������������������������(���������������������������)
totalCount: 0,
// ������������������������������
- pageSizes: [10, 20, 30, 40],
+ pageSizes: [10, 30, 60, 100],
// ������������������������������������������
pageSize: 10
}
--
Gitblit v1.8.0