From 237197fbfb7e54bdbeb0f16e7907790a8097c9f6 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 16:48:22 +0800
Subject: [PATCH] 上传处置修改

---
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue               |   44 ++++++--------
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue |    7 --
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue   |   67 ---------------------
 src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue                |   30 ----------
 src/views/operate/sms/smsTemplate/index.vue                                                      |    4 +
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue               |    2 
 src/views/intelligentPatrol/illegalSearch/index.vue                                              |    1 
 src/views/operate/disposal/casepool/dispatch/index.vue                                           |    2 
 8 files changed, 27 insertions(+), 130 deletions(-)

diff --git a/src/views/intelligentPatrol/illegalSearch/index.vue b/src/views/intelligentPatrol/illegalSearch/index.vue
index 463c5e2..9e7e68c 100644
--- a/src/views/intelligentPatrol/illegalSearch/index.vue
+++ b/src/views/intelligentPatrol/illegalSearch/index.vue
@@ -237,6 +237,7 @@
     },
     // 琛ㄥ崟閲嶇疆
     handleReset() {
+      this.currentPage = 1;
       this.$refs.condition.resetFields();
       this.getTableData();
     },
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index c3dec03..3bebbe3 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -88,7 +88,7 @@
                 <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>
+                    <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :vioData="vioData" :illData="illData"></uploadIll>
                 </el-dialog>
                 <!-- tools -->
                 <div class="tools">
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index 7564035..29c80ea 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -68,13 +68,6 @@
                 callback(new Error('鐜板満鎯呭喌璇存槑涓嶈兘涓虹┖'));
             }
         }
-        const checkReplay = (rule, value, callback) => {
-            if (value) {
-                callback()
-            } else {
-                callback(new Error('淇¤鍥炲璇存槑涓嶈兘涓虹┖'));
-            }
-        }
         const checkSitPic = (rule, value, callback) => {
             if (value.length !== 0) {
                 callback()
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
index 6bd30a2..391627a 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/book/index.vue
@@ -51,19 +51,6 @@
                 <!-- 鏂囦功鐓х墖涓婁紶 -->
                 <el-form-item label="鏂囦功鐓х墖涓婁紶:" prop="writPic">
                     <div class="upImg">
-                        <!-- <div class="img-list" v-if="book.writPic.length!==0">
-                            <div class="img" v-for="(item,index) in book.writPic" :key="index">
-                                <img :src="item" alt="">
-                                <i class="el-icon-close myicon" @click="handleRemove(index,1)"></i>
-                            </div>
-                        </div>
-                        <div class="upload" v-if="book.writPic.length<4">
-                            <el-upload :file-list="fileList" class="upload-demo"
-                                action="/sccg/file/medias" multiple :show-file-list="false"
-                                :limit="4" :on-success="handleSuccess1" :headers="getToken()">
-                                <i class="el-icon-plus"></i>
-                            </el-upload>
-                        </div> -->
                         <MyUpload  @setPictureUrl="writPic" @delPictureUrl="delWritPic"></MyUpload>
                         <div class="tip">{{book.writPic.length}} / 4</div>
                     </div>
@@ -71,19 +58,6 @@
                 <!-- 鏁存敼鍓嶇収鐗� -->
                 <el-form-item label="鏁存敼鍓嶇収鐗�:" prop="originalPic">
                      <div class="upImg">
-                        <!-- <div class="img-list" v-if="book.originalPic.length!==0">
-                            <div class="img" v-for="(item,index) in book.originalPic" :key="index">
-                                <img :src="item" alt="">
-                                <i class="el-icon-close myicon" @click="handleRemove(index,2)"></i>
-                            </div>
-                        </div>
-                        <div class="upload" v-if="book.originalPic.length<4">
-                            <el-upload :file-list="fileList" class="upload-demo"
-                                action="/sccg/file/medias" multiple :show-file-list="false"
-                                :limit="4" :on-success="handleSuccess2" :headers="getToken()">
-                                <i class="el-icon-plus"></i>
-                            </el-upload>
-                        </div>  -->
                         <MyUpload  @setPictureUrl="originalPic" @delPictureUrl="delOriginalPic"></MyUpload>
                         <div class="tip">{{book.originalPic.length}} / 4</div>
                     </div>
@@ -91,19 +65,6 @@
                 <!-- 鏁存敼鍚庣収鐗� -->
                 <el-form-item label="鏁存敼鍚庣収鐗�:" prop="rectifiedPic">
                     <div class="upImg">
-                        <!-- <div class="img-list" v-if="book.rectifiedPic.length!==0">
-                            <div class="img" v-for="(item,index) in book.rectifiedPic" :key="index">
-                                <img :src="item" alt="">
-                                <i class="el-icon-close myicon" @click="handleRemove(index,3)"></i>
-                            </div>
-                        </div> -->
-                        <!-- <div class="upload" v-if="book.rectifiedPic.length<4">
-                            <el-upload :file-list="fileList" class="upload-demo"
-                                action="/sccg/file/medias" multiple :show-file-list="false"
-                                :limit="4" :on-success="handleSuccess3" :headers="getToken()">
-                                <i class="el-icon-plus"></i>
-                            </el-upload>
-                        </div> -->
                         <MyUpload  @setPictureUrl="rectifiedPic" @delPictureUrl="delRectifiedPic"></MyUpload>
                         <div class="tip">{{book.rectifiedPic.length}} / 4</div>
                     </div>
@@ -111,19 +72,6 @@
                 <!-- 鍏朵粬鐓х墖 -->
                 <el-form-item label="鍏朵粬:" prop="otherPic">
                     <div class="upImg">
-                        <!-- <div class="img-list" v-if="book.otherPic.length!==0"> -->
-                            <!-- <div class="img" v-for="(item,index) in book.otherPic" :key="index">
-                                <img :src="item" alt="">
-                                <i class="el-icon-close myicon" @click="handleRemove(index,4)"></i>
-                            </div>
-                        </div>
-                        <div class="upload" v-if="book.otherPic.length<4">
-                            <el-upload :file-list="fileList" class="upload-demo"
-                                action="/sccg/file/medias" multiple :show-file-list="false"
-                                :limit="4" :on-success="handleSuccess4" :headers="getToken()">
-                                <i class="el-icon-plus"></i>
-                            </el-upload>
-                        </div> -->
                         <MyUpload  @setPictureUrl="otherPic" @delPictureUrl="delOtherPic"></MyUpload>
                         <div class="tip">{{book.otherPic.length}} / 4</div>
                     </div>
@@ -242,11 +190,6 @@
                         trigger: 'blur', validator: checkId
                     }
                 ],
-                // illegalType: [
-                //     {  
-                //         trigger: 'blur', validator: checkVio
-                //     }
-                // ],
                 sendTime: [
                     {
                         trigger: 'blur', validator: checkGiveTime
@@ -309,8 +252,7 @@
         const {getBookType} = this
         getBookType();
         const {mycode}=this;
-        console.log(121,mycode)
-        this.getEventInfo(mycode)
+        this.getEventInfo(mycode);
     },
     props: ['caseId', 'closeDialog','mycode'],
     methods: {
@@ -364,22 +306,19 @@
             if (this.book.originalPic.length < 4) {
                 this.book.writPic.push(baseUrl + url)
             }
-            console.log(url);
         },
         //鍒犻櫎鍥剧墖
         delWritPic({url}){
             const baseUrl = 'http://140.143.152.226:8410/';
-            console.log(url);
             this.book.writPic.splice(this.book.writPic.indexOf(baseUrl + url),1);
         },
 
  // 璁剧疆涓婁紶鎴愬姛涔嬪悗鐨勫浘鐗囧湴鍧�
- otherPic({ url }) {
+        otherPic({ url }) {
             const baseUrl = 'http://140.143.152.226:8410/';
             if (this.book.otherPic.length < 4) {
                 this.book.otherPic.push(baseUrl + url)
             }
-            console.log(url);
         },
         //鍒犻櫎鍥剧墖
         delOtherPic({url}){
@@ -393,7 +332,6 @@
             if (this.book.otherPic.length < 4) {
                 this.book.rectifiedPic.push(baseUrl + url)
             }
-            console.log(url);
         },
         //鍒犻櫎鍥剧墖
         delRectifiedPic({url}){
@@ -406,7 +344,6 @@
             if (this.book.otherPic.length < 4) {
                 this.book.originalPic.push(baseUrl + url)
             }
-            console.log(url);
         },
         //鍒犻櫎鍥剧墖
         delOriginalPic({url}){
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 297bc13..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,11 +1,11 @@
 <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>
+        <MyBook ref="book" :writ="writ" :mycode="mycode"></MyBook>
 
         <div class="footer">
             <el-button @click="handleSubmit" type="primary">纭畾</el-button>
@@ -22,14 +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() {
-        this.getUserId();
+      this.arriveData = this.vioData.arrivalSituation;
+      this.evidenceData = this.vioData.investigation;
+      this.writ = this.vioData.writ;
     },
     methods: {
         handleSubmit() {
@@ -38,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',
@@ -55,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),
@@ -63,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,
@@ -136,16 +138,6 @@
                     })
                     return false;
                 }
-            })
-        },
-        // 鑾峰彇鐢ㄦ埛id
-        getUserId(){
-            const myname = sessionStorage.getItem('name');
-            this.$axios({
-                method:'get',
-                url:'sccg/admin/info?name='+myname,
-            })
-            .then(res=>{
             })
         },
         handleBack(){
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..a16c06b 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
@@ -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;
diff --git a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
index f106521..f84672e 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
@@ -25,50 +25,20 @@
     },
     props: ['caseId', 'closeDialog'],
     created() {
-        console.log(this.caseId);
     },
     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}`,
                                 data:{
-                                    // arrivalAddress: arrive.arrive.arrivalAddress,
-                                    // arrivalTime: 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,
-                                    // 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,
-                                    // certificateCode: evidence.user.certificateCode,
-                                    // educationDegree: evidence.user.educationDegree,
-                                    // career: evidence.user.career,
-                                    // work: evidence.user.work,
-                                    // nation: evidence.user.nation,
-                                    // nativePlace: evidence.user.nativePlace,
-                                    // liveAddress: evidence.user.liveAddress,
-                                    // registerAddress: evidence.user.registerAddress,
                                 }
                             })
                                 .then(res => {
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index edfc603..46ae7ce 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -182,6 +182,10 @@
         },
         // 閲嶇疆
         handleReset(){
+          this.currentPage = 1;
+          this.context = '';
+          this.messageStatus = 0;
+          this.getMessageList();
         },
         // 鏌ョ湅
         handleView(data){

--
Gitblit v1.8.0