From 4641a877cd6a94e4d35dca7f7f14bc1443e2d2ad Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 17:59:55 +0800
Subject: [PATCH] 上传处置类型修改
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 118 +++++++++++++++++---------------------
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue | 35 ++++-------
src/views/operate/message/myIndex/update/index.vue | 1
src/views/operate/disposal/casepool/dispatch/index.vue | 5 -
4 files changed, 68 insertions(+), 91 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 22db796..cbec1b5 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -88,7 +88,7 @@
<el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
:before-close="handleClose">
<uploadVio v-if="mystatus === 1" :illegalType="illegalType" :imageResourceId="imageResourceId" :caseId="caseId" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :illData="illData"></uploadIll>
+ <uploadIll v-else :caseId="caseId" :illegal-type="illegalType" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :imageResourceId="imageResourceId"></uploadIll>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -180,7 +180,6 @@
caseId: '',
caseCode: null,
vioData: null,
- illData: null,
illegalType: null
}
},
@@ -325,7 +324,7 @@
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
this.imageResourceId = filesPictureVo.imageResources[0]?.id;
- this.illegalType = this.mystatus === 1 ? baseCase.violations.actionCause : baseCase.violations.typeText;
+ this.illegalType = this.mystatus === 1 ? baseCase.violations.actionCause : baseCase.illegalBuilding.categoryText;
})
.catch(err => this.$message.error(err))
this.dialogUpload = true;
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
index 391627a..5f92844 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -51,28 +51,28 @@
<!-- 鏂囦功鐓х墖涓婁紶 -->
<el-form-item label="鏂囦功鐓х墖涓婁紶:" prop="writPic">
<div class="upImg">
- <MyUpload @setPictureUrl="writPic" @delPictureUrl="delWritPic"></MyUpload>
+ <MyUpload @setPictureUrl="writPic" @delPictureUrl="delWritPic" :picture-list="book.writPic"></MyUpload>
<div class="tip">{{book.writPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鏁存敼鍓嶇収鐗� -->
<el-form-item label="鏁存敼鍓嶇収鐗�:" prop="originalPic">
<div class="upImg">
- <MyUpload @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload>
+ <MyUpload @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic" :picture-list="book.originalPic"></MyUpload>
<div class="tip">{{book.originalPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鏁存敼鍚庣収鐗� -->
<el-form-item label="鏁存敼鍚庣収鐗�:" prop="rectifiedPic">
<div class="upImg">
- <MyUpload @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></MyUpload>
+ <MyUpload @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic" :picture-list="book.rectifiedPic"></MyUpload>
<div class="tip">{{book.rectifiedPic.length}} / 4</div>
</div>
</el-form-item>
<!-- 鍏朵粬鐓х墖 -->
<el-form-item label="鍏朵粬:" prop="otherPic">
<div class="upImg">
- <MyUpload @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload>
+ <MyUpload @setPictureUrl="otherPic" @delPictureUrl="delOtherPic" :picture-list="book.otherPic"></MyUpload>
<div class="tip">{{book.otherPic.length}} / 4</div>
</div>
</el-form-item>
@@ -81,7 +81,7 @@
</div>
</template>
<script>
-import {getCodeList} from '@/utils/helper'
+import {deepClone, getCodeList} from '@/utils/helper'
import MyUpload from "@/components/myUpload"
export default {
components: {
@@ -249,25 +249,16 @@
}
},
created() {
- const {getBookType} = this
- getBookType();
- const {mycode}=this;
- this.getEventInfo(mycode);
+ this.getBookType();
+ if (this.writ) {
+ this.book = deepClone(this.writ);
+ this.book.originalPic = this.writ.originalPic.split(',');
+ this.book.writPic = this.writ.writPic.split(',');
+ this.book.otherPic = this.writ.otherPic.split(',');
+ }
},
- props: ['caseId', 'closeDialog','mycode'],
+ props: ['caseId', 'closeDialog','mycode', 'writ'],
methods: {
- // 鑾峰彇妗堜欢淇℃伅
- async getEventInfo(mycode) {
- await this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${mycode}`
- })
- .then(res => {
- this.basecase = res.data.baseCase.illegalBuilding.categoryText;
- this.book.illegalType=res.data.baseCase.illegalBuilding.categoryId;
- })
- },
-
handleSuccess1(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
if (this.book.writPic.length < 4) {
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
index 5e3c82a..6624a3e 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -3,9 +3,9 @@
<!-- 鍒拌揪鐜板満鎯呭喌 -->
<MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="2" :mycode="mycode"></MyEvidence>
+ <MyEvidence ref="evidence" :evidenceData="evidenceData" :illegal-type="illegalType"></MyEvidence>
<!-- 鏂囩涔︾被 -->
- <MyBook ref="book" :writ="writ" :mycode="mycode"></MyBook>
+ <MyBook ref="book" :writ="writ"></MyBook>
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
@@ -17,7 +17,8 @@
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
import MyBook from "../components/book"
-import {parseTime} from '@/utils/index'
+import { parseTime } from '@/utils/index'
+import casequery from "@/api/operate/basecase";
export default {
components: {
MyArrive, MyEvidence, MyBook
@@ -29,7 +30,7 @@
writ: null
}
},
- props: ['caseId','closeDialog','mycode', 'vioData'],
+ props: ['caseId','closeDialog', 'vioData', 'illegalType', 'imageResourceId'],
created() {
this.arriveData = this.vioData.arrivalSituation;
this.evidenceData = this.vioData.investigation;
@@ -42,72 +43,59 @@
const { evidenceForm } = evidence.$refs;
const { bookForm } = book.$refs;
arriveForm.validate((valid) => {
- // const partyInfoId = this.evidenceData ? partyInfo.id : null;
if (valid) {
evidenceForm.validate((flag) => {
if (flag) {
bookForm.validate((bookFlag) => {
if (bookFlag) {
- this.$axios({
- method: 'post',
- url: `sccg/dispatch_handle/addition_dispose_result?caseId=${this.caseId}&type=2`,
- data: {
- arrivalAddress: arrive.arrive.arrivalAddress,
- arrivalTime: parseTime(arrive.arrive.arrivalTime),
- situationExplain: arrive.arrive.situationExplain,
- replyExplain: arrive.arrive.replyExplain,
- situationPic: `${arrive.arrive.situationPic}`,
-
- undertaker: evidence.evidence.undertaker,
- assistant: evidence.evidence.assistant,
- investigationTime: parseTime(evidence.evidence.investigationTime),
- address: evidence.evidence.address,
- caseAction: evidence.evidence.caseAction,
- description: evidence.evidence.description,
- pic: `${evidence.evidence.pic}`,
- partyInfoId: this.evidenceData ? evidence.evidence.partyInfo.id : null,
-
- name: evidence.user.name,
- phoneCode: evidence.user.phoneCode,
- certificateType: evidence.user.certificateType,
- certificateCode: evidence.user.certificateCode,
- educationDegree: evidence.user.educationDegree,
- career: evidence.user.career,
- work: evidence.user.work,
- nation: evidence.user.nation,
- nativePlace: evidence.user.nativePlace,
- liveAddress: evidence.user.liveAddress,
- registerAddress: evidence.user.registerAddress,
- //
- writType: book.book.writType,
- writCode: book.book.writCode,
- illegalType: book.book.illegalType,
- sendTime: parseTime(book.book.sendTime),
- limitTime: parseTime(book.book.limitTime),
- sendContent: book.book.sendContent,
- rectifySituation:book.book.rectifySituation,
- rectifyTime:parseTime(book.book.rectifyTime),
- remark: book.book.remark,
- writPic: `${book.book.writPic}`,
- originalPic: `${book.book.originalPic}`,
- rectifiedPic: `${book.book.rectifiedPic}`,
- otherPic: `${book.book.otherPic}`,
- }
- })
- .then(res => {
- if (res.code === 200) {
- this.$message({
- type: 'success',
- message: '涓婁紶鎴愬姛',
- })
- this.$emit('closeDialog', { flag: false });
- } else {
- this.$message({
- type: 'warning',
- message: res.message
- })
- }
- })
+ const arriveData = Object.assign({}, arrive.arrive);
+ const evidenceData = Object.assign({}, evidence.evidence);
+ const bookData = Object.assign({}, book.book);
+ const partyInfo = evidence.user;
+ const arrivalSituationId = arriveData.id;
+ const investigationId = evidenceData.id;
+ const partyInfoId = this.evidenceData ? partyInfo.id : null;
+ const evidencePic = evidenceData.pic.join(',');
+ const situationPic = arriveData.situationPic.join(',');
+ const otherPic = bookData.otherPic.join(',');
+ const writPic = bookData.writPic.join(',');
+ const rectifiedPic = bookData.rectifiedPic.join(',');
+ const originalPic = bookData.originalPic.join(',');
+ delete evidenceData.id;
+ delete evidenceData.partyInfo;
+ delete evidenceData.userInfo;
+ delete evidenceData.pic;
+ delete arriveData.situationPic;
+ delete arriveData.id;
+ delete bookData.otherPic;
+ delete bookData.writPic;
+ delete bookData.rectifiedPic;
+ delete bookData.originalPic;
+ delete evidenceData.illegalType;
+ casequery.updateDisposeResult({
+ caseId: this.caseId,
+ imageResourceId: this.imageResourceId,
+ pic: evidencePic,
+ arrivalSituationId,
+ situationPic,
+ partyInfoId,
+ investigationId,
+ otherPic,
+ writPic,
+ rectifiedPic,
+ originalPic,
+ ...arriveData,
+ ...evidenceData,
+ ...partyInfo,
+ ...bookData
+ })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.$emit('closeDialog');
+ })
+ .catch(err => {
+ this.$message.error(err);
+ })
} else {
return false;
}
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index ed4ba27..9ea2741 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -245,7 +245,6 @@
}
},
getType(){
- debugger
return this.type;
},
// 鑾峰彇閮ㄩ棬鏍�
--
Gitblit v1.8.0