From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visits.vue | 298 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 183 insertions(+), 115 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 2c4ea45..bdb040a 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -1,115 +1,115 @@
<template>
- <TableLayout :permissions="['business:visits:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <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>
- <el-form-item label="瀹℃壒鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
- <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
- <el-option label="瀹℃壒涓�" value="1"></el-option>
- <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
- <el-option label="瀹℃牳涓嶉�氳繃" value="3"></el-option>
- <el-option label="鍙栨秷" value="4"></el-option>
- <el-option label="棰勭害鎴愬姛" value="5"></el-option>
- <el-option label="棰勭害澶辫触" value="6"></el-option>
- <el-option label="鎷滆涓�" value="7"></el-option>
- <el-option label="宸茬绂�" value="8"></el-option>
- <el-option label="宸插け鏁�" value="9"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
-<!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
-<!-- <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:delete']">-->
-<!-- <li><el-button type="primary" @click="$refs.operaVisitsWindow.open('鏂板缓璁垮鐢宠淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:visits:create']">鏂板缓</el-button></li>-->
-<!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:visits:delete']">鍒犻櫎</el-button></li>-->
-<!-- </ul>-->
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <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="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">
- <template slot-scope="{row}">
- <span>璧凤細{{row.starttime}}</span><br/>
- <span>姝細{{row.endtime}}</span>
- </template>
- </el-table-column>
- <el-table-column label="绛惧埌鏃堕棿" min-width="170px">
- <template slot-scope="{row}">
- <div v-if="row.inDate && row.outDate">
- <span>璧凤細{{row.inDate}}</span><br/>
- <span>姝細{{row.outDate}}</span>
- </div>
- <span v-else>-</span>
- </template>
- </el-table-column>
- <el-table-column label="闅忚浜哄憳" min-width="100px">
- <template slot-scope="{row}">
- <span>{{row.memberNum || '-'}}</span>
- </template>
- </el-table-column>
- <el-table-column label="闅忚杞﹁締" min-width="100px">
- <template slot-scope="{row}">
- <span>{{row.carNum}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">寰呮彁浜ゅ鎵�</span>
- <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996);">瀹℃壒涓�</span>
- <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996);">瀹℃牳閫氳繃</span>
- <span style="color: gray;" v-if="row.status === 3" >瀹℃牳涓嶉�氳繃</span>
- <span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
- <span v-if="row.status === 5" style="color: green">棰勭害鎴愬姛</span>
- <span v-if="row.status === 6" style="color: gray">棰勭害澶辫触</span>
- <span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
- <span v-if="row.status === 8" style="color: red">宸茬绂�</span>
- <span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
- </template>
- </el-table-column>
- <el-table-column
- v-if="containPermissions(['business:visits:update', 'business:visits:delete'])"
- label="鎿嶄綔"
- min-width="100"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" v-permissions="['business:visits:update']">鏌ョ湅璇︽儏</el-button>
-<!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- <!-- 璇︽儏 -->
- <OperaVisitsDesWindow ref="OperaVisitsDesWindow" />
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:visits:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <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>
+ <el-form-item label="瀹℃壒鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+ <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
+ <el-option label="瀹℃壒涓�" value="1"></el-option>
+ <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
+ <el-option label="瀹℃牳涓嶉�氳繃" value="3"></el-option>
+ <el-option label="鍙栨秷" value="4"></el-option>
+ <el-option label="棰勭害鎴愬姛" value="5"></el-option>
+ <el-option label="棰勭害澶辫触" value="6"></el-option>
+ <el-option label="鎷滆涓�" value="7"></el-option>
+ <el-option label="宸茬绂�" value="8"></el-option>
+ <el-option label="宸插け鏁�" value="9"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
+ <li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
+ v-permissions="['business:visits:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" :loading="isWorking.export" @click="exportExcel"
+ v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <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="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">
+ <template slot-scope="{row}">
+ <span>璧凤細{{ row.starttime }}</span><br />
+ <span>姝細{{ row.endtime }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="绛惧埌鏃堕棿" min-width="170px">
+ <template slot-scope="{row}">
+ <div v-if="row.inDate && row.outDate">
+ <span>璧凤細{{ row.inDate }}</span><br />
+ <span>姝細{{ row.outDate }}</span>
+ </div>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏂藉伐浜哄憳" min-width="100px">
+ <template slot-scope="{row}">
+ <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.carNos }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">寰呮彁浜ゅ鎵�</span>
+ <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996);">澶勭悊涓�</span>
+ <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996);">宸插悓鎰�</span>
+ <span style="color: gray;" v-if="row.status === 3">宸叉嫆缁�</span>
+ <span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
+ <span v-if="row.status === 5" style="color: green">涓嬪彂鎴愬姛</span>
+ <span v-if="row.status === 6" style="color: gray">涓嬪彂澶辫触</span>
+ <span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
+ <span v-if="row.status === 8" style="color: red">宸茬绂�</span>
+ <span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="containPermissions(['business:visits:update', 'business:visits:delete'])" label="鎿嶄綔"
+ 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="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>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ <!-- 璇︽儏 -->
+ <!-- <OperaVisitsDesWindow ref="OperaVisitsDesWindow" /> -->
+ <TaskDetail v-if="isShowDetail" ref="DetailRef" />
+ <!-- 鏂板缓 -->
+ <OperaVisitsWindow @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="operaVisitsWindowRef" />
+ </template>
+ </TableLayout>
</template>
<script>
@@ -117,23 +117,28 @@
import TableLayout from '@/layouts/TableLayout'
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 },
- data () {
+ components: { TableLayout, Pagination, TaskDetail, OperaVisitsWindow },
+ data() {
return {
+ isShowEdit: false,
+ isShowDetail: false,
// 鎼滅储
searchForm: {
name: '',
companyName: '',
idcardNo: '',
- status: ''
+ status: '',
+ type: 0
}
}
},
- created () {
+ created() {
this.config({
module: '璁垮鐢宠淇℃伅琛�',
api: '/business/visits',
@@ -142,5 +147,68 @@
})
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(() => {
+ this.$refs.operaVisitsWindowRef.isShowModal = true
+ })
+ },
+ departure(id) {
+ this.$confirm('纭畾绂诲巶鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ level(id)
+ .then(res => {
+ this.page = 1
+ this.getData()
+ })
+ }).catch(() => {
+
+ })
+ },
+ cancel(id) {
+ this.$confirm('纭畾鍙栨秷棰勭害鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ 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()
+ })
+ }).catch(() => {
+
+ })
+ }
+ }
}
</script>
--
Gitblit v1.9.3