From b94eae282d4014c9e861797168e61f270f04c821 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:33:50 +0800
Subject: [PATCH] 审核修改

---
 src/components/scene/index.vue                                                     |    8 ++--
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue |    3 +
 src/views/operate/management/myIndex/components/examine/index.vue                  |   10 -----
 src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue |    1 
 src/views/operate/management/myIndex/index.vue                                     |   14 +-----
 src/views/operate/management/myIndex/components/illExamine/index.vue               |   38 +++---------------
 src/views/operate/viewEvent/components/illclosure/index.vue                        |   10 -----
 7 files changed, 17 insertions(+), 67 deletions(-)

diff --git a/src/components/scene/index.vue b/src/components/scene/index.vue
index 303d81b..13a2f54 100644
--- a/src/components/scene/index.vue
+++ b/src/components/scene/index.vue
@@ -152,7 +152,7 @@
         if (invesList) {
             if (invesList) {
                 this.investigation = invesList;
-                this.investigation.pic = invesList.pic.split(",");
+                this.investigation.pic = invesList.pic?.split(",");
                 this.partyInfo = invesList.partyInfo;
             }
         }
@@ -161,10 +161,10 @@
             this.arrivalSituation.situationPic = mylist.situationPic.split(",")
         }
         this.mybaseCase = baseCase;
-        if (baseCase.violations == null) {
-            this.type = baseCase.illegalBuilding.categoryText
+        if (baseCase.violations) {
+          this.type = baseCase.violations.typeText;
         } else {
-            this.type = baseCase.violations.typeText;
+          this.type = baseCase.illegalBuilding.categoryText;
         }
     },
     methods: {
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 e5572f6..ada7b23 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
@@ -70,7 +70,8 @@
                                   delete bookData.writPic;
                                   delete bookData.rectifiedPic;
                                   delete bookData.originalPic;
-                                  delete evidenceData.illegalType;
+                                  delete partyInfo.illegalType;
+                                  delete bookData.illegalType;
                                   casequery.updateDisposeResult({
                                     caseId: this.caseId,
                                     imageResourceId: this.imageResourceId,
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 5047c1d..b675f00 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
@@ -54,6 +54,7 @@
                           delete evidenceData.pic;
                           delete arriveData.situationPic;
                           delete arriveData.id;
+                          delete partyInfo.illegalType;
                           casequery.updateDisposeResult({
                             caseId: this.caseId,
                             imageResourceId: this.imageResourceId,
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index 3ca352b..ccd1c49 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -54,16 +54,6 @@
                         <span class="data-detail">{{baseCase.violations.description}}</span>
                     </el-form-item>
                 </div>
-                <!-- <div class="data-item">
-                    <el-form-item label="澶勭疆鏂瑰紡:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div> 
-                <div class="data-item">
-                    <el-form-item label="澶勭疆鎵嬫:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div>-->
                 <!-- 瀹℃牳鎰忚 -->
                 <el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
                     <el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
diff --git a/src/views/operate/management/myIndex/components/illExamine/index.vue b/src/views/operate/management/myIndex/components/illExamine/index.vue
index fb3102c..4720bd3 100644
--- a/src/views/operate/management/myIndex/components/illExamine/index.vue
+++ b/src/views/operate/management/myIndex/components/illExamine/index.vue
@@ -53,16 +53,6 @@
                         <span class="data-detail">{{baseCase.illegalBuilding.description}}</span>
                     </el-form-item>
                 </div>
-                <!-- <div class="data-item">
-                    <el-form-item label="澶勭疆鏂瑰紡:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div>
-                <div class="data-item">
-                    <el-form-item label="澶勭疆鎵嬫:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div> -->
                 <!-- 瀹℃牳鎰忚 -->
                 <el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
                     <el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
@@ -106,7 +96,7 @@
             if (value) {
                 callback();
             } else {
-                callback(new Error('瀹℃牳鎰忚涓嶈兘涓虹┖'))
+                callback(new Error('瀹℃牳鎰忚涓嶈兘涓虹┖'));
             }
         }
         return {
@@ -158,18 +148,16 @@
         },
         // 鎻愪氦瀹℃牳鎰忚
         handleSubmit(mystatus) {
-            // this.getUserLoginInfo();
             const { baseCase } = this;
             this.$refs.viewForm.validate((valid) => {
                 if (valid) {
-                    this.$axios({
+                  this.$axios({
                         method: 'post',
                         url: 'sccg/check_handle/check',
                         data: {
-                            baseCaseId: baseCase.id,
-                            checkOpinion: baseCase.auditOpinion,
-                            currentUser: baseCase.createUser,
-                            status: mystatus,
+                          baseCaseId: baseCase.id,
+                          checkOpinion: baseCase.auditOpinion,
+                          result: mystatus === 0 ? '椹冲洖':'閫氳繃',
                         }
                     })
                         .then(res => {
@@ -179,6 +167,8 @@
                                     message: mystatus === 0 ? '椹冲洖鎴愬姛' : '瀹℃牳閫氳繃'
                                 })
                                 this.$emit('closeDialog', { flag: false });
+                            } else {
+                              this.$message.error(res.message);
                             }
 
                         })
@@ -187,20 +177,6 @@
                     return false;
                 }
             })
-        },
-        // 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
-        getUserLoginInfo() {
-            // 鑾峰彇鐧诲綍鍚�;
-            const username = sessionStorage.getItem('name');
-            this.$axios({
-                method: 'get',
-                url: 'sccg/admin/info',
-                data: {
-                    name: 'username'
-                }
-            })
-                .then(res => {
-                })
         },
     },
     props: ['info', 'closeDialog']
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 03bbd75..0a9c456 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -84,7 +84,7 @@
                 <!-- 璇︽儏椤甸潰 -->
                 <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
                     :before-close="handleNoClose">
-                    <MyDetail :info=info v-if="myproblem==1 ? true:false" :mycode = 'code'></MyDetail>
+                    <MyDetail :info=info v-if="myproblem === 1" :mycode = 'code'></MyDetail>
                     <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
                 </el-dialog>
                 <!-- tools -->
@@ -185,7 +185,6 @@
     methods: {
         // 鎵归噺鍒犻櫎
         mulDelete(idArr) {
-            console.log(idArr);
             this.$axios({
                 method: 'delete',
                 url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -199,7 +198,6 @@
         },
         // 鎵ц涓嬫媺妗嗘搷浣�
         selectChange(list) {
-            console.log(this.tempList);
             if (this.tempList.length !== 0) {
                 if (list === 3) {
                     this.preMyIdx = list;
@@ -219,11 +217,7 @@
             list.forEach(item => {
                 this.tempList.push(item.code);
             })
-            if (list.length === this.tableData.length) {
-                this.all = true;
-            } else {
-                this.all = false
-            }
+            this.all = list.length === this.tableData.length;
         },
         // 鍏ㄩ��
         selectAll() {
@@ -240,7 +234,6 @@
             console.log(number);
             this.$confirm('纭鍒犻櫎锛�')
                 .then(_ => {
-                    console.log(1);
                     this.$axios({
                         method: 'delete',
                         url: `sccg/violations/delete?id=${number}`,
@@ -269,12 +262,11 @@
         },
         // 璁剧疆琛ㄦ牸鏂戦┈绾�
         tableRowClassName({ row, rowIndex }) {
-            if ((rowIndex + 1) % 2 == 0) {
+            if ((rowIndex + 1) % 2 === 0) {
                 return 'warning-row';
             } else {
                 return 'success-row';
             }
-            return '';
         },
         // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
         changeCurrentPage(page) {
diff --git a/src/views/operate/viewEvent/components/illclosure/index.vue b/src/views/operate/viewEvent/components/illclosure/index.vue
index 8bf7dab..7e3913a 100644
--- a/src/views/operate/viewEvent/components/illclosure/index.vue
+++ b/src/views/operate/viewEvent/components/illclosure/index.vue
@@ -53,16 +53,6 @@
                         <span class="data-detail">{{baseCase.illegalBuilding.description}}</span>
                     </el-form-item>
                 </div>
-                <!-- <div class="data-item">
-                    <el-form-item label="澶勭疆鏂瑰紡:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div>
-                <div class="data-item">
-                    <el-form-item label="澶勭疆鎵嬫:">
-                        <span class="data-detail">xxxxxxx</span>
-                    </el-form-item>
-                </div> -->
                 <!-- 瀹℃牳鎰忚 -->
                 <el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
                     <el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>

--
Gitblit v1.8.0