From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/disposal/casepool/dispatch/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index d844f2f..cbec1b5 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -72,7 +72,7 @@
<template slot-scope="scope">
<div class="operation">
<div class="btn">
- <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ <span @click="openDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
</div>
</div>
</template>
@@ -87,8 +87,8 @@
<!-- 涓婁紶椤甸潰 -->
<el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
:before-close="handleClose">
- <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId" :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData"></uploadIll>
+ <uploadVio v-if="mystatus === 1" :illegalType="illegalType" :imageResourceId="imageResourceId" :caseId="caseId" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
+ <uploadIll v-else :caseId="caseId" :illegal-type="illegalType" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :imageResourceId="imageResourceId"></uploadIll>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -122,7 +122,7 @@
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
import MyIllDetail from '@/components/illdetail'
-import casequery from "@/api/operate/casequery";
+import casequery from "@/api/operate/basecase";
import helper from '@/utils/mydate'
export default {
components: {
@@ -180,7 +180,7 @@
caseId: '',
caseCode: null,
vioData: null,
- illData: null
+ illegalType: null
}
},
created() {
@@ -319,11 +319,12 @@
this.dialogView = true;
})
},
- async opernDialog(data) {
+ async openDialog(data) {
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
- this.imageResourceId = filesPictureVo.imageResources[0].id;
+ this.imageResourceId = filesPictureVo.imageResources[0]?.id;
+ this.illegalType = this.mystatus === 1 ? baseCase.violations.actionCause : baseCase.illegalBuilding.categoryText;
})
.catch(err => this.$message.error(err))
this.dialogUpload = true;
--
Gitblit v1.8.0