From 73af3ed9fbcc616cdecc739fc4307163c19c5764 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 14:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/reportRecord.vue | 145 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 120 insertions(+), 25 deletions(-)
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 348d2ef..98ee6a0 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -1,30 +1,106 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table v-loading="loading" :data="list" stripe row-key="id" default-expand-all>
- <el-table-column prop="" label="鍏ュ洯杞﹁締" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="鍏徃鍚嶇О" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="鑱旂郴浜轰俊鎭�" min-width="100" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="鎵嬫満鍙�" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="琚浜�" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="鎷滆鏃堕棿" min-width="120" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" label="鎷滆浜嬬敱" min-width="80" show-overflow-tooltip></el-table-column>
- <el-table-column prop="" fixed="right" label="鐘舵��" min-width="100"></el-table-column>
+ <QueryForm
+ v-model="filters"
+ :query-form-config="queryFormConfig"
+ @handleQuery="getList(1)"
+ @clear="clear"
+ />
+ <el-table
+ v-loading="loading"
+ :data="dataList"
+ stripe
+ row-key="id"
+ default-expand-all
+ >
+ <el-table-column
+ prop="carNos"
+ label="鍏ュ洯杞﹁締"
+ min-width="100px"
+ ></el-table-column>
+ <el-table-column
+ prop="companyName"
+ label="鍏徃鍚嶇О"
+ min-width="100px"
+ ></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="receptMemberName"
+ 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
+ prop="reason"
+ label="鎷滆浜嬬敱"
+ min-width="100px"
+ ></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 label="鎿嶄綔" width="230" fixed="right">
- <template slot-scope="{row}">
- <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
+ <template slot-scope="{ row }">
+ <el-button
+ type="text"
+ @click="handleDetail(row)"
+ v-permissions="['business:company:update']"
+ >鏌ョ湅璇︽儏</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
- <ReportDetail v-if="isShowDetail" ref="DetailRef" />
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="getList"
+ :pagination="pagination"
+ />
+ <ReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import ReportDetail from './page-components/ReportDetail.vue'
+// import ReportDetail from './page-components/ReportDetail.vue'
+import ReportDetail from '@/views/task/visReportDetail.vue'
+import { fetchList } from '@/api/business/visits'
export default {
components: {
ReportDetail,
@@ -33,18 +109,19 @@
},
data () {
return {
- isShowDetail: false,
+ isShowReport: false,
activeTab: '0',
filters: {},
+ dataList: [],
queryFormConfig: {
formItems: [
{
- filed: 'idCard',
+ filed: 'carNos',
type: 'input',
label: '杞︾墝鍙�'
},
{
- filed: 'name',
+ filed: 'companyName',
type: 'input',
label: '鍏徃鍚嶇О'
}
@@ -60,19 +137,38 @@
capacity: 10,
page: 1
},
- list: [{}],
total: 0
}
},
+ created () {
+ this.getList()
+ },
methods: {
- handleDetail () {
- this.isShowDetail = true
+ handleDetail (row) {
+ this.isShowReport = true
this.$nextTick(() => {
- this.$refs.DetailRef.isShowModal = true
+ this.$nextTick(() => {
+ this.$refs.VisReportDetailRef.id = row.id
+ this.$refs.VisReportDetailRef.type = 1
+ this.$refs.VisReportDetailRef.getDetail()
+ this.$refs.VisReportDetailRef.isShowModal = true
+ })
})
},
- getList (page) {},
- clear () { },
+ getList (page) {
+ const { pagination, filters } = this
+ pagination.page = page || pagination.page
+ fetchList({
+ model: { ...filters, type: 2 },
+ ...pagination
+ }).then(res => {
+ this.dataList = res.records || []
+ })
+ },
+ clear () {
+ this.filters = {}
+ this.getList(0)
+ },
handleSizeChange (capacity) {
this.pagination.capacity = capacity
}
@@ -81,5 +177,4 @@
</script>
<style lang="scss" scoped>
-
</style>
--
Gitblit v1.9.3