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/newWorkOrder.vue | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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]
--
Gitblit v1.8.0