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 | 52 +++++++++++++++++++--------------------------------- 1 files changed, 19 insertions(+), 33 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 12b8756..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" :mytype="2" :mycode="mycode"></MyEvidence> + <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="2" :mycode="mycode"></MyEvidence> <!-- 鏂囩涔︾被 --> - <MyBook ref="book" :mycode="mycode"></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> @@ -25,15 +22,18 @@ components: { MyArrive, MyEvidence, MyBook }, - data() { - return { - // result:'', - } - }, - props: ['caseId','closeDialog','mycode'], + 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() { @@ -42,13 +42,11 @@ 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', @@ -59,7 +57,7 @@ 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), @@ -67,8 +65,8 @@ 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, @@ -97,7 +95,6 @@ } }) .then(res => { - console.log(res); if (res.code === 200) { this.$message({ type: 'success', @@ -141,17 +138,6 @@ }) return false; } - }) - }, - // 鑾峰彇鐢ㄦ埛id - getUserId(){ - const myname = sessionStorage.getItem('name'); - this.$axios({ - method:'get', - url:'sccg/admin/info?name='+myname, - }) - .then(res=>{ - console.log(res); }) }, handleBack(){ -- Gitblit v1.8.0