From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
index c37e09c..b675f00 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -3,7 +3,7 @@
<!-- 鍒拌揪鐜板満鎯呭喌 -->
<MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="1" :mycode="mycode"></MyEvidence>
+ <MyEvidence ref="evidence" :illegal-type="illegalType" :evidenceData="evidenceData"></MyEvidence>
<!-- 搴曢儴鎸夐挳 -->
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
@@ -26,7 +26,7 @@
evidenceData: null
}
},
- props: ['caseId', 'closeDialog','mycode', 'vioData', 'imageResourceId'],
+ props: ['caseId', 'closeDialog', 'vioData', 'imageResourceId', 'illegalType'],
created() {
this.arriveData = this.vioData.arrivalSituation;
this.evidenceData = this.vioData.investigation;
@@ -42,7 +42,7 @@
if (flag) {
const arriveData = Object.assign({}, arrive.arrive);
const evidenceData = Object.assign({}, evidence.evidence);
- const { partyInfo } = evidenceData;
+ const partyInfo = evidence.user;
const arrivalSituationId = arriveData.id;
const investigationId = evidenceData.id;
const partyInfoId = this.evidenceData ? partyInfo.id : null;
@@ -54,6 +54,7 @@
delete evidenceData.pic;
delete arriveData.situationPic;
delete arriveData.id;
+ delete partyInfo.illegalType;
casequery.updateDisposeResult({
caseId: this.caseId,
imageResourceId: this.imageResourceId,
--
Gitblit v1.8.0