From 9eb85404a96658d83fc0168f306adabb8c1c992e Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Tue, 14 Nov 2023 10:31:03 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue | 154 +++++++++++++++++++++-----------------------------
1 files changed, 65 insertions(+), 89 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
index 3a5489f..23a9650 100644
--- a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
@@ -10,13 +10,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="���������������" prop="escalationTime" class="span">
- <el-date-picker
- v-model="formData.escalationTime"
- value-format="yyyy-MM-dd"
- size="small"
- type="date"
- placeholder="������������"
- />
+ <el-date-picker v-model="formData.escalationTime" value-format="yyyy-MM-dd" size="small" type="date" placeholder="������������" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -29,24 +23,14 @@
<el-col :span="12">
<el-form-item label="���������������" prop="unitId" class="span">
<el-select v-model="formData.unitId" placeholder="���������" size="small">
- <el-option
- v-for="item in unitList"
- :key="item.unitId"
- :label="item.unitName"
- :value="item.unitId"
- />
+ <el-option v-for="item in unitList" :key="item.unitId" :label="item.unitName" :value="item.unitId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="���������������" prop="polluteType" class="span">
<el-select v-model="formData.polluteType" placeholder="���������" size="small">
- <el-option
- v-for="item in polluteList"
- :key="item.dataKey"
- :label="item.dataValue"
- :value="item.dataKey"
- />
+ <el-option v-for="item in polluteList" :key="item.dataKey" :label="item.dataValue" :value="item.dataKey" />
</el-select>
</el-form-item>
</el-col>
@@ -55,12 +39,7 @@
<el-col :span="12">
<el-form-item label="���������������" prop="changeType" class="span">
<el-select v-model="formData.changeType" placeholder="���������" size="small" @change="changeEnumList">
- <el-option
- v-for="item in Dic.changeEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
+ <el-option v-for="item in Dic.changeEnum" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -75,12 +54,7 @@
<el-col :span="12">
<el-form-item label="���������������" prop="escalationUnitId" class="span">
<el-select v-model="formData.escalationUnitId" placeholder="���������" size="small">
- <el-option
- v-for="item in unitList"
- :key="item.unitId"
- :label="item.unitName"
- :value="item.unitId"
- />
+ <el-option v-for="item in unitList" :key="item.unitId" :label="item.unitName" :value="item.unitId" />
</el-select>
</el-form-item>
</el-col>
@@ -109,13 +83,7 @@
<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"
- />
+ <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>
@@ -135,13 +103,7 @@
</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
- />
+ <video ref="video" style="width: 300px;height: 500px" :src="dialogImageUrl" controls autoplay />
</div>
</el-dialog>
</div>
@@ -164,6 +126,11 @@
return {
videoVisible: false,
formData: {
+ unitId: '',
+ escalationUnitId: '',
+ changeType: '',
+ polluteType: '',
+ escalationTime: new Date(),
fileBaseList: [],
escalationName: '',
changeDay: 0,
@@ -192,9 +159,7 @@
changeType: [
{ required: true, message: '���������������������', trigger: 'change' }
],
- changeDay: [
- { required: true, message: '���������������', trigger: 'blur' }
- ],
+ changeDay: [{ required: true, message: '���������������', trigger: 'blur' }],
escalationUnitId: [
{ required: true, message: '���������������������', trigger: 'change' }
],
@@ -216,18 +181,26 @@
}
},
watch: {
- 'pageState': {
+ pageState: {
handler(newVal) {
if (this.pageState === 'edit') {
- if (this.parentFormData.fileBaseList && this.parentFormData.fileBaseList.length > 0) {
+ if (
+ this.parentFormData.fileBaseList &&
+ this.parentFormData.fileBaseList.length > 0
+ ) {
this.parentFormData.fileBaseList.forEach(item => {
if (item.fileType === 1) {
- this.fileBaseList.push(`${requestObj.baseUrl}file/preview/${item.fileId}`) // ������
+ this.fileBaseList.push(
+ `${requestObj.baseUrl}file/preview/${item.fileId}`
+ ) // ������
}
// const srcApi = item.fileType === 1 ? api + 'preview/' : api + 'preview/cover/'
// this.fileBaseList.push(`${requestObj.baseUrl}file/preview/${item.fileId}`) // ������
this.fileBaseListCover.push({
- url: item.fileType === 1 ? `${requestObj.baseUrl}file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}file/preview/${item.fileId}`,
+ url:
+ item.fileType === 1
+ ? `${requestObj.baseUrl}file/preview/cover/${item.fileId}`
+ : `${requestObj.baseUrl}file/preview/${item.fileId}`,
fileType: item.fileType,
fileId: item.fileId,
fileName: item.fileName
@@ -241,22 +214,15 @@
immediate: true
}
},
- created() {
- console.log('oldValue', this.parentFormData)
- if (!(JSON.stringify(this.parentFormData) === '{}')) {
- this.formData = this.parentFormData
- this.formData.polluteType = String(this.parentFormData.polluteType)
- } else {
- const name = this.$store.state.user.name
- this.formData.escalationName = name
- }
-
+ async created() {
this.getUnitList()
- this.getContaminateList()
+
+ console.log('oldValue', this.parentFormData)
+
bus.$on('changeFileAfterList', (type, fileList) => {
this.formData.fileBaseList = []
if (fileList.length > 0) {
- fileList.map((item) => {
+ fileList.map(item => {
if (item.response) {
console.log('item.response.data', item.response.data)
this.formData.fileBaseList.push(item.response.data)
@@ -304,20 +270,32 @@
this.$request({
url: '/allocation/unit',
method: 'get'
- }).then((res) => {
+ }).then(res => {
this.unitList = res.data
+ this.getContaminateList()
})
},
getContaminateList() {
this.$request({
url: '/allocation/contaminate',
method: 'get'
- }).then((res) => {
+ }).then(res => {
this.polluteList = res.data
+ if (!(JSON.stringify(this.parentFormData) === '{}')) {
+ this.formData = this.parentFormData
+ this.formData.polluteType = String(this.parentFormData.polluteType)
+ } else {
+ const name = this.$store.state.user.name
+ this.formData.escalationName = name
+ this.formData.changeType = this.Dic.changeEnum[0].value
+ this.formData.unitId = this.unitList[0].unitId
+ this.formData.escalationUnitId = this.unitList[0].unitId
+ this.formData.polluteType = this.polluteList[0].dataKey
+ }
})
},
close() {
- this.$nextTick(function() {
+ this.$nextTick(function () {
this.$refs.ruleForm.resetFields()
})
this.$emit('update:visible', false)
@@ -333,7 +311,7 @@
})
}
this.formData.state = val
- this.$refs.ruleForm.validate((valid) => {
+ this.$refs.ruleForm.validate(valid => {
if (valid) {
// this.formData.fileBaseList = [...this.parentFormData.fileBaseList, this.formData.fileBaseList]
this.$emit('handleSubmit', this.formData)
@@ -347,47 +325,45 @@
</script>
<style lang="scss" scoped>
-.titBox{
+.titBox {
position: relative;
font-size: 18px;
- div:first-child{
+ div:first-child {
position: absolute;
left: 10px;
}
- div{
+ div {
display: inline-block;
}
}
.block {
- display: inline-block !important;
- margin-right: 10px;
+ display: inline-block !important;
+ margin-right: 10px;
}
.textBox {
- display: flex;
- justify-content: space-between;
- margin-left: 15px;
+ display: flex;
+ justify-content: space-between;
+ margin-left: 15px;
}
-.el-dialog__body>div {
- border-bottom: 1px dashed rgba(187, 187, 187, 1);
+.el-dialog__body > div {
+ border-bottom: 1px dashed rgba(187, 187, 187, 1);
}
-.span{
+.span {
/deep/.el-form-item__content {
-
- div {
- width: 100%;
- }
+ div {
+ width: 100%;
+ }
}
}
.textare {
- /deep/.el-form-item__content {
- width: 800px;
+ /deep/.el-form-item__content {
+ width: 800px;
- div {
- width: 100%;
- }
+ div {
+ width: 100%;
}
}
-
+}
</style>
--
Gitblit v1.8.0