From 4a25bd9ba57cf9b9985d93e85fab1e065a0911bc Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 28 Sep 2023 14:22:21 +0800
Subject: [PATCH] fix:立行立改
---
src/components/UploadExcel/index.vue | 14 ++++--
src/views/toCarryOutLegislativeReforms/components/queryForm.vue | 4 --
src/views/toCarryOutLegislativeReforms/delay/index.vue | 37 +++++++++++-------
src/views/toCarryOutLegislativeReforms/reform/index.vue | 13 +++++-
src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue | 27 ++++++-------
src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue | 7 ++-
src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue | 18 +++++++--
7 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/src/components/UploadExcel/index.vue b/src/components/UploadExcel/index.vue
index 39f111c..ff357cd 100644
--- a/src/components/UploadExcel/index.vue
+++ b/src/components/UploadExcel/index.vue
@@ -48,7 +48,7 @@
</span>
</div>
</el-upload>
- <el-dialog :visible.sync="dialogVisible" width="600px" :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
+ <el-dialog :visible.sync="dialogVisible" width="600px" append-to-body :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
<div style="text-align: center;">
<img
v-if="dialogType == 1"
@@ -101,11 +101,15 @@
methods: {
handleCancel(e) {
- if (this.$refs.video) {
- this.$refs.video.pause()
- }
- this.dialogImageUrl = ''
this.dialogVisible = false
+
+ setTimeout(() => {
+ if (this.$refs.video) {
+ this.$refs.video.pause()
+ }
+
+ this.dialogImageUrl = ''
+ }, 200)
},
// ���������
before_upload(file) {
diff --git a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
index e8784e7..fb2d0cc 100644
--- a/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue
@@ -216,10 +216,13 @@
if (this.pageState === 'edit') {
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}`) // ������
+ }
// const srcApi = item.fileType === 1 ? api + 'preview/' : api + 'preview/cover/'
- this.fileBaseList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ // 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
diff --git a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
index 1fc2650..5acefb7 100644
--- a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -140,10 +140,6 @@
})
},
onSubmit() {
- if (this.valueTime.length > 0) {
- this.formData.endTime = this.valueTime[1]
- this.formData.startTime = this.valueTime[0]
- }
this.$emit('handleSearch', this.formData)
},
handleAdd() {
diff --git a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
index 78f1045..4c00f47 100644
--- a/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue
@@ -80,7 +80,7 @@
</div>
</div>
<!-- ������������ -->
- <div v-if="dialogData.pageType ==='detail' && parentFormData.state >=30">
+ <div v-if="(dialogData.pageType ==='detail'||dialogData.pageType ==='approve' )&& parentFormData.state >=30">
<el-row class="rectificationContent">
<el-col :span="12"><div class="grid-content bg-purple" />
<el-descriptions title="������������" :column="parseInt('2')">
@@ -384,8 +384,10 @@
searchthisFileList(newVal) {
if (newVal.fileBaseList && newVal.fileBaseList.length > 0) {
newVal.fileBaseList.forEach(item => {
- // const srcApi = item.fileType === 1 ? api + 'preview/' : api + 'preview/cover/'
- this.fileBaseList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ if (item.fileType === 1) {
+ 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}`,
fileType: item.fileType,
@@ -396,7 +398,9 @@
}
if (newVal.fileChangeList && newVal.fileChangeList.length > 0) {
newVal.fileChangeList.forEach(item => {
- this.fileChangeList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ if (item.fileType === 1) {
+ this.fileChangeList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ }
this.fileChangeListCover.push({
url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
fileType: item.fileType,
@@ -406,6 +410,9 @@
}
if (newVal.fileApproveList && newVal.fileApproveList.length > 0) {
newVal.fileApproveList.forEach(item => {
+ if (item.fileType === 1) {
+ this.fileApproveList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ }
this.fileApproveList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
this.fileApproveListCover.push({
url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
@@ -416,6 +423,9 @@
}
if (newVal.fileList && newVal.fileList.length > 0) {
newVal.fileList.forEach(item => {
+ if (item.fileType === 1) {
+ this.fileDelayList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
+ }
this.fileDelayList.push(`${requestObj.baseUrl}/file/preview/${item.fileId}`) // ������
this.fileDelayListCover.push({
url: item.fileType === 1 ? `${requestObj.baseUrl}/file/preview/cover/${item.fileId}` : `${requestObj.baseUrl}/file/preview/${item.fileId}`,
diff --git a/src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue b/src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue
index aefdd20..7f99c37 100644
--- a/src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/delay/componets/queryForm.vue
@@ -5,16 +5,7 @@
<el-form-item label="���������������">
<el-input v-model="formData.allocationNum" placeholder="���������������" size="small" clearable />
</el-form-item>
- <el-form-item label="���������������">
- <el-select v-model="formData.state" placeholder="���������" clearable size="small">
- <el-option
- v-for="item in Dic.allocationExtensionApproveEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
+
<el-form-item label="���������������">
<el-date-picker
v-model="formData.startTime"
@@ -36,6 +27,7 @@
placeholder="������������"
/>
</el-form-item>
+
<el-form-item label="���������������">
<el-select v-model="formData.unitId" size="small" clearable placeholder="���������">
<el-option
@@ -66,7 +58,16 @@
/>
</el-select>
</el-form-item>
-
+ <el-form-item label="���������������">
+ <el-select v-model="formData.state" placeholder="���������" clearable size="small">
+ <el-option
+ v-for="item in Dic.allocationExtensionApproveEnum"
+ :key="item.value"
+ :label="item.name"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="onSubmit">������</el-button>
<el-button v-if="searchType==='reform'" type="primary" size="small" @click="handleAdd">������</el-button>
@@ -116,10 +117,6 @@
})
},
onSubmit() {
- if (this.valueTime.length > 0) {
- this.formData.endTime = this.valueTime[1]
- this.formData.startTime = this.valueTime[0]
- }
this.$emit('handleSearch', this.formData)
},
handleAdd() {
diff --git a/src/views/toCarryOutLegislativeReforms/delay/index.vue b/src/views/toCarryOutLegislativeReforms/delay/index.vue
index 708d539..bee5f52 100644
--- a/src/views/toCarryOutLegislativeReforms/delay/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/delay/index.vue
@@ -6,6 +6,7 @@
<el-table
:data="tableData"
border
+ size="mini"
max-height="680"
style="width: 100%"
:header-cell-style="{
@@ -15,7 +16,7 @@
<el-table-column
type="index"
label="������"
- width="100px"
+ width="60px"
align="center"
/>
<el-table-column
@@ -46,21 +47,23 @@
label="������������"
>
<template slot-scope="scope">
- <p> {{ dictObj.changeEnum[scope.row.changeType] }}</p>
+ <div> {{ dictObj.changeEnum[scope.row.changeType] }}</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="extensionNum"
+ width="60px"
label="������������"
>
<template slot-scope="scope">
- <p> {{ scope.row.extensionNum }}���</p>
+ <div> {{ scope.row.extensionNum }}���</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="address"
+ width="80px"
label="������"
>
<template slot-scope="scope">
@@ -86,16 +89,14 @@
</el-table-column>
<el-table-column
align="center"
- prop="address"
- label="���������������������"
>
<template slot="header">
- <p>������������</p>
- <p>���������</p>
+ <div>������������</div>
+ <div>���������</div>
</template>
<template slot-scope="scope">
- <p> {{ scope.row.escalationName }}</p>
- <p> {{ updatUnitIdFormatter(scope.row) }}</p>
+ <div> {{ scope.row.escalationName }}</div>
+ <div> {{ updatUnitIdFormatter(scope.row) }}</div>
</template>
</el-table-column>
@@ -103,17 +104,18 @@
align="center"
>
<template slot="header">
- <p>���������</p>
- <p>������������</p>
+ <div>���������</div>
+ <div>������������</div>
</template>
<template slot-scope="scope">
- <p>{{ scope.row.updateName }}</p>
- <p>{{ scope.row.updateTime }}</p>
+ <div>{{ scope.row.updateName }}</div>
+ <div>{{ scope.row.updateTime }}</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="address"
+ width="100px"
label="������"
>
<template slot-scope="scope">
@@ -166,7 +168,8 @@
pageSizes: [10, 20, 30, 40],
// ������������������������������������������
pageSize: 10
- }
+ },
+ searchData: {}
}
},
created() {
@@ -179,6 +182,10 @@
this.handleSearch()
},
handleSearch(obj) {
+ this.searchData.isInvalid = 0
+ if (obj) {
+ this.searchData = obj
+ }
this.$request({
url: '/allocationExtension/page',
method: 'post',
@@ -198,11 +205,13 @@
this.pagination.PageSize = val
// ���������������������������������������������������������������������������
this.pagination.currentPage = 1
+ this.handleSearch()
},
// ���������������
handleCurrentChange(val) {
// ���������������������
this.pagination.currentPage = val
+ this.handleSearch()
// console.log(val)
},
openWorkOrdinDialog(row, type) {
diff --git a/src/views/toCarryOutLegislativeReforms/reform/index.vue b/src/views/toCarryOutLegislativeReforms/reform/index.vue
index df6afda..5af2319 100644
--- a/src/views/toCarryOutLegislativeReforms/reform/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -241,7 +241,10 @@
pageState: 'add',
invalidReason: '',
slectRow: {},
- title: ''
+ title: '',
+ searchData: {
+ isInvalid: 0
+ }
}
},
@@ -376,11 +379,15 @@
})
},
handleSearch(obj) {
+ this.searchData.isInvalid = 0
+ if (obj) {
+ this.searchData = obj
+ }
this.$request({
url: '/allocation/page',
method: 'post',
data: {
- ...obj,
+ ...this.searchData,
'page': this.pagination
}
}).then((res) => {
@@ -399,11 +406,13 @@
this.pagination.PageSize = val
// ���������������������������������������������������������������������������
this.pagination.currentPage = 1
+ this.handleSearch()
},
// ���������������
handleCurrentChange(val) {
// ���������������������
this.pagination.currentPage = val
+ this.handleSearch()
// console.log(val)
},
openWorkOrdinDialog(row, type) {
--
Gitblit v1.8.0