From 9027351c68d5dabf70120f5c1304abebddc3afca Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 22 十一月 2022 18:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 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 350eb59..6b1f6fc 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
@@ -1,68 +1,68 @@
<template>
<div class="vio">
<!-- 鍒拌揪鐜板満鎯呭喌 -->
- <MyArrive ref="arrive" @getArrive="getArrive"></MyArrive>
+ <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence" @getEvidence="getEvidence"></MyEvidence>
+ <MyEvidence ref="evidence" :evienceData="evienceData" :mytype="1" :mycode="mycode"></MyEvidence>
<!-- 搴曢儴鎸夐挳 -->
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
- <el-button>杩斿洖</el-button>
+ <el-button @click="handleBack">杩斿洖</el-button>
</div>
</div>
</template>
<script>
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
+import { parseTime } from '@/utils/index'
+
export default {
components: {
MyArrive, MyEvidence
},
data() {
return {
-
+ arriveData: null,
+ evienceData: null
}
},
- props: ['caseId', 'closeDialog'],
+ props: ['caseId', 'closeDialog','mycode', 'vioData'],
created() {
- console.log(this.caseId);
+ this.arriveData = this.vioData.arrivalSituation;
+ this.evienceData = this.vioData.investigation;
},
methods: {
handleSubmit() {
const { arrive, evidence } = this.$refs;
const { arriveForm } = arrive.$refs;
const { evidenceForm } = evidence.$refs;
- // console.log(evidence.$refs);
arriveForm.validate((valid) => {
- // console.log(valid);
if (valid) {
evidenceForm.validate((flag) => {
if (flag) {
- // arrive.arrive;evidence.user;evidence.evidence;
this.$axios({
method: 'post',
- url: `sccg/dispatch_handle/addition_dispose_result/${this.caseId}/${1}`,
+ url: `sccg/dispatch_handle/addition_dispose_result?caseId=`+this.caseId+'&type=1',
data:{
arrivalAddress: arrive.arrive.arrivalAddress,
- arrivalTime: arrive.arrive.arrivalTime,
+ 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: evidence.evidence.investigationTime,
+ investigationTime: parseTime(evidence.evidence.investigationTime),
address: evidence.evidence.address,
caseAction: evidence.evidence.caseAction,
description: evidence.evidence.description,
pic: `${evidence.evidence.pic}`,
//
- illegalType: evidence.user.illegalType,
name: evidence.user.name,
phoneCode: evidence.user.phoneCode,
- certificateType: `${evidence.user.certificateType}`,
+ certificateType: evidence.user.certificateType,
certificateCode: evidence.user.certificateCode,
- educationDegree: `${evidence.user.educationDegree}`,
+ educationDegree: evidence.user.educationDegree,
career: evidence.user.career,
work: evidence.user.work,
nation: evidence.user.nation,
@@ -72,7 +72,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -100,20 +99,15 @@
}
})
},
- // 鑾峰緱arrive鐨勪俊鎭�
- getArrive(obj) {
- console.log(obj);
- },
- // 鑾峰緱evidence瀵硅薄
- getEvidence(obj) {
- console.log(obj);
+ handleBack(){
+ this.$emit('closeDialog',{flag:false});
}
}
}
</script>
<style lang="scss" scoped>
.vio {
- padding: 20px 200px;
+ padding: 20px 200px 100px;
}
.footer {
--
Gitblit v1.8.0