From 15de314310f14ebd37b820c99a7da81bbbd1cdfd Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 16:50:17 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 71 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 42 deletions(-)
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 73bb31f..5e3c82a 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
@@ -1,15 +1,12 @@
<template>
<div class="ill">
<!-- 鍒拌揪鐜板満鎯呭喌 -->
- <MyArrive ref="arrive"></MyArrive>
+ <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
<!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence ref="evidence"></MyEvidence>
+ <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="2" :mycode="mycode"></MyEvidence>
<!-- 鏂囩涔︾被 -->
- <MyBook ref="book"></MyBook>
- <!-- <div class="result">
- <el-input v-model="result" placeholder="璇疯緭鍏ュ鐞嗘剰瑙�"></el-input>
- </div> -->
- <!-- 搴曢儴鎸夐挳 -->
+ <MyBook ref="book" :writ="writ" :mycode="mycode"></MyBook>
+
<div class="footer">
<el-button @click="handleSubmit" type="primary">纭畾</el-button>
<el-button @click="handleBack">杩斿洖</el-button>
@@ -20,19 +17,23 @@
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
import MyBook from "../components/book"
+import {parseTime} from '@/utils/index'
export default {
components: {
MyArrive, MyEvidence, MyBook
},
- data() {
- return {
- // result:'',
- }
- },
- props: ['caseId','closeDialog'],
+ data() {
+ return {
+ arriveData: null,
+ evidenceData: null,
+ writ: null
+ }
+ },
+ props: ['caseId','closeDialog','mycode', 'vioData'],
created() {
- console.log(this.caseId);
- this.getUserId();
+ this.arriveData = this.vioData.arrivalSituation;
+ this.evidenceData = this.vioData.investigation;
+ this.writ = this.vioData.writ;
},
methods: {
handleSubmit() {
@@ -41,38 +42,36 @@
const { evidenceForm } = evidence.$refs;
const { bookForm } = book.$refs;
arriveForm.validate((valid) => {
+ // const partyInfoId = this.evidenceData ? partyInfo.id : null;
if (valid) {
- console.log(valid);
evidenceForm.validate((flag) => {
if (flag) {
- console.log(flag);
bookForm.validate((bookFlag) => {
- console.log(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: 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,
+ partyInfoId: this.evidenceData ? evidence.evidence.partyInfo.id : null,
+
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,
@@ -82,12 +81,12 @@
//
writType: book.book.writType,
writCode: book.book.writCode,
- // illegalType: book.book.illegalType,
- sendTime: book.book.sendTime,
- limitTime: book.book.limitTime,
+ illegalType: book.book.illegalType,
+ sendTime: parseTime(book.book.sendTime),
+ limitTime: parseTime(book.book.limitTime),
sendContent: book.book.sendContent,
rectifySituation:book.book.rectifySituation,
- rectifyTime: book.book.rectifyTime,
+ rectifyTime:parseTime(book.book.rectifyTime),
remark: book.book.remark,
writPic: `${book.book.writPic}`,
originalPic: `${book.book.originalPic}`,
@@ -96,7 +95,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -142,17 +140,6 @@
}
})
},
- // 鑾峰彇鐢ㄦ埛id
- getUserId(){
- const myname = sessionStorage.getItem('name');
- this.$axios({
- method:'get',
- url:'sccg/admin/info?name='+myname,
- })
- .then(res=>{
- console.log(res);
- })
- },
handleBack(){
this.$emit('closeDialog',{falg:false})
}
@@ -161,7 +148,7 @@
</script>
<style lang="scss" scoped>
.ill {
- padding: 20px 200px;
+ padding: 20px 200px 100px;
}
.footer {
--
Gitblit v1.8.0