From 387e8b0743240de72425e5b5c5709d629ace9aa4 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期二, 11 十月 2022 20:17:43 +0800
Subject: [PATCH] 新增消息界面、处理遗留问题

---
 src/views/operate/car/myIndex/index.vue |   67 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/views/operate/car/myIndex/index.vue b/src/views/operate/car/myIndex/index.vue
index 5bd43a7..0f0b869 100644
--- a/src/views/operate/car/myIndex/index.vue
+++ b/src/views/operate/car/myIndex/index.vue
@@ -5,7 +5,7 @@
                 <div class="search">
                     <span>杞﹁締鎼滅储:</span>
                     <div class="option">
-                        <el-input placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
+                        <el-input @input="handleSearch" v-model="context" placeholder="璇疯緭鍏ヨ溅鐗屽彿"></el-input>
                     </div>
                 </div>
                 <div class="addCar">
@@ -26,30 +26,24 @@
                     @selection-change="tableChange">
                     <el-table-column type="selection" min-width="5">
                     </el-table-column>
-                    <el-table-column prop="code" label="杞︾墝鍙�" min-width="10">
-                        <template slot-scope="scope">
-                            <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
-                        </template>
+                    <el-table-column prop="carNumber" label="杞︾墝鍙�" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="code" label="杞﹀瀷" min-width="10" v-if="mystatus===2">
+                    <el-table-column prop="carModel" label="杞﹀瀷" min-width="10" v-if="mystatus===2">
                     </el-table-column>
-                    <el-table-column prop="eventSource" label="杞︿富濮撳悕" min-width="10">
-                        <template slot-scope="scope">
-                            <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
-                        </template>
+                    <el-table-column prop="ownerName" label="杞︿富濮撳悕" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="category" label="杞﹁締浣跨敤浜哄憳" min-width="10">
+                    <el-table-column prop="vehicleUser" label="杞﹁締浣跨敤浜哄憳" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="type" label="鑱旂郴鏂瑰紡" min-width="10">
+                    <el-table-column prop="contact" label="鑱旂郴鏂瑰紡" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="actionCause" :label="mystatus === 1 ? '鎵�灞為儴闂�':'鏂藉伐鍦板潃'" min-width="10">
+                    <el-table-column :prop="mystatus===1 ? 'belong' : 'geographicPosition'" :label="mystatus === 1 ? '鎵�灞為儴闂�':'鏂藉伐鍦板潃'" min-width="10">
                     </el-table-column>
-                    <el-table-column prop="site" :label="mystatus === 1 ? '鎵�灞炲ぇ闃�' : '鏂藉伐鍗曚綅'" min-width="10">
+                    <el-table-column :prop="mystatus===1 ? 'depart' : 'constructionOrg'" :label="mystatus === 1 ? '鎵�灞炲ぇ闃�' : '鏂藉伐鍗曚綅'" min-width="10">
                     </el-table-column>
                     <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
                         <template slot-scope="scope">
                             <div class="btn">
-                                <span @click="handleReset(scope.row)">鏌ョ湅</span>
+                                <span @click="handleView(scope.row)">鏌ョ湅</span>
                                 <span class="line">|</span>
                                 <span>鍒犻櫎</span>
                             </div>
@@ -60,6 +54,13 @@
                 <el-dialog :visible.sync="dialogAdd" width="60%" title="鏂板杞﹁締"
                     v-if="dialogAdd" :before-close="handleClose">
                     <Mycreate v-if="mystatus === 1"  @closeDialog="closeDialog"></Mycreate>
+                    <MySoil v-else @closeDialog="closeDialog"></MySoil>
+                </el-dialog>
+                <!-- 鏌ョ湅 -->
+                <el-dialog :visible.sync="dialogView" width="60%" title="鏌ョ湅杞﹁締淇℃伅"
+                    v-if="dialogView" :before-close="handleNoClose">
+                    <MyViewLaw v-if="mystatus === 1" :info="info"></MyViewLaw>
+                    <MyViewSoil v-else :info="info"></MyViewSoil>
                 </el-dialog>
                 <!-- tools -->
                 <div class="tools">
@@ -90,17 +91,22 @@
     </div>
 </template>
 <script>
-import Mycreate from './createUser'
+import Mycreate from './create/law'
+import MySoil from './create/soil'
+import MyViewLaw from './update/law'
+import MyViewSoil from './update/soil'
 export default {
     components: {
-        Mycreate
+        Mycreate,MySoil,MyViewLaw,
+        MyViewSoil
     },
     data() {
         return {
             tableData: [],
             context: "",
             dialogAdd:false,
-            info: {},
+            dialogView:false,
+            info: '',
             totalNum: null,
             pageSize: 10,
             currentPage: 1,
@@ -142,12 +148,22 @@
             ],
             mystatus:1,
             caseId:'',
+            timer:null,
         }
     },
     created() {
         this.getUserList();
     },
     methods: {
+        // 鎼滅储杞﹁締
+        handleSearch(val){
+            if(this.timer){
+                clearTimeout(this.timer);
+            }
+            this.timer = setTimeout(()=>{
+                this.getUserList();
+            },1000);
+        },
         // 娣诲姞杞﹁締
         handleAddCar(){
             this.dialogAdd = true;
@@ -217,6 +233,7 @@
                 url:`sccg/car_Manage/query_enforce?current=${currentPage}&size=${pageSize}&carNum=${carNum}`,
             })
             .then(res=>{
+                console.log(res);
                 arr = res.data;
             })
             return arr;
@@ -279,14 +296,24 @@
         async JumpView(data){
             await this.getEventInfo(data.code);
         },
+        handleNoClose(done){
+            done();
+        },
         opernDialog(data){
             this.dialogAdd = true;
             this.caseId = data.id;
             // console.log(data); 
         },
-        // 鍏抽棴涓婁紶鐣岄潰
-        closeDialog({flag}){
+        // 鍏抽棴鐣岄潰
+        closeDialog({flag,index}){
             this.dialogAdd = flag;
+            if(index===1){
+                this.getUserList();
+            }
+        },
+        handleView(data){
+            this.info = data;
+            this.dialogView = true;
         }
     }
 }

--
Gitblit v1.8.0