From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/business/visits.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 25ebbb8..51ee101 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">
@@ -91,13 +92,15 @@
<el-table-column
v-if="containPermissions(['business:visits:update', 'business:visits:delete'])"
label="鎿嶄綔"
- min-width="100"
+ min-width="200"
fixed="right"
>
<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="resend(row.id)" v-permissions="['business:visits:update']" icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</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 +112,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 +126,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 +156,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(() => {
@@ -161,7 +178,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- level(id)
+ level(id)
.then(res => {
this.page = 1
this.getData()
@@ -176,7 +193,22 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- visitCancel(id)
+ visitCancel(id)
+ .then(res => {
+ this.page = 1
+ this.getData()
+ })
+ }).catch(() => {
+
+ })
+ },
+ resend (id) {
+ this.$confirm('纭畾灏濊瘯閲嶆柊娲楀彂棰勭害鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.api.visitResend(id)
.then(res => {
this.page = 1
this.getData()
--
Gitblit v1.9.3