From 5a85dcab83e969d6b21c599b512a15117e9b8651 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 04 七月 2024 08:54:30 +0800
Subject: [PATCH] ''

---
 admin/src/views/business/visits.vue |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 25ebbb8..bbf8005 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -8,8 +8,8 @@
             <el-form-item label="韬唤璇佸彿" prop="idcardNo">
                 <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="缁勭粐鍚嶇О" prop="companyName">
-                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+            <el-form-item label="璁垮鍗曚綅" prop="companyName">
+                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ瀹㈠崟浣�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="瀹℃壒鐘舵��" prop="status">
                 <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
@@ -46,7 +46,7 @@
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column prop="name" label="璁垮濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
-                <el-table-column prop="companyName" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
+                <el-table-column prop="companyName" label="璁垮鍗曚綅" min-width="100px"></el-table-column>
                 <el-table-column prop="receptMemberName" label="琚浜�" min-width="100px"></el-table-column>
                 <el-table-column prop="reason" label="鎷滆浜嬬敱" min-width="100px"></el-table-column>
                 <el-table-column label="棰勭害鏃堕棿" min-width="170px">
@@ -64,14 +64,15 @@
                         <span v-else>-</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="闅忚浜哄憳" min-width="100px">
+                <el-table-column label="鏂藉伐浜哄憳" min-width="100px">
                     <template slot-scope="{row}">
-                        <span>{{row.memberNum || '-'}}</span>
+                        <span v-if="row.type == 0">鍚�</span>
+                        <span v-if="row.type == 1">鏄�</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="闅忚杞﹁締" min-width="100px">
                     <template slot-scope="{row}">
-                        <span>{{row.carNum}}</span>
+                        <span>{{row.carNos}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
@@ -97,7 +98,8 @@
                     <template slot-scope="{row}">
                       <el-button type="text" @click="departure(row.id)" v-permissions="['business:visits:level']" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲巶</el-button>
                       <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']" icon="el-icon-delete"   style="color: red" v-if="row.status == 5">鍙栨秷棰勭害</el-button>
-                        <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" icon="el-icon-view">璇︽儏</el-button>
+                        <!-- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" icon="el-icon-view">璇︽儏</el-button> -->
+                        <el-button type="text" @click="handleDetail(row)" icon="el-icon-view">璇︽儏</el-button>
 <!--                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
                     </template>
                 </el-table-column>
@@ -109,7 +111,8 @@
             >
             </pagination>
             <!--      璇︽儏      -->
-            <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
+            <!-- <OperaVisitsDesWindow ref="OperaVisitsDesWindow" /> -->
+            <TaskDetail v-if="isShowDetail" ref="DetailRef" />
             <!-- 鏂板缓 -->
             <OperaVisitsWindow @close="isShowEdit = false" @success="search"  v-if="isShowEdit" ref="operaVisitsWindowRef" />
         </template>
@@ -122,20 +125,23 @@
 import Pagination from '@/components/common/Pagination'
 import OperaVisitsDesWindow from '@/components/business/OperaVisitsDesWindow'
 import OperaVisitsWindow from '@/components/business/operaVisitsWindow'
+import TaskDetail from '@/views/task/visSubDetail.vue'
 
 export default {
   name: 'Visits',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaVisitsDesWindow, OperaVisitsWindow },
+  components: { TableLayout, Pagination, TaskDetail, OperaVisitsWindow },
   data () {
     return {
       isShowEdit: false,
+      isShowDetail: false,
       // 鎼滅储
       searchForm: {
         name: '',
         companyName: '',
         idcardNo: '',
-        status: ''
+        status: '',
+        type: 0
       }
     }
   },
@@ -149,6 +155,16 @@
     this.search()
   },
   methods: {
+    handleDetail (row) {
+      this.isShowDetail = true
+      console.log('row', row);
+      this.$nextTick(() => {
+        this.$refs.DetailRef.id = row.id
+        this.$refs.DetailRef.type = 0
+        this.$refs.DetailRef.getDetail()
+        this.$refs.DetailRef.isShowModal = true
+      })
+    },
     handleEdit () {
       this.isShowEdit = true
       this.$nextTick(() => {

--
Gitblit v1.9.3