From 2ae60f81bbef5b2de4a9cc3e90bbedf19e8e4446 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 07 三月 2024 10:24:00 +0800
Subject: [PATCH] mrshi
---
admin/src/views/business/visitorSources.vue | 14 +
admin/src/views/business/internalCompany.vue | 24 +-
admin/src/components/business/OperaDeviceRoleWindow.vue | 27 ++
admin/src/views/business/parkBook.vue | 28 +-
admin/src/views/business/deletePersonnel.vue | 143 +++++++++++++++++
admin/src/components/business/cardOpeningRecord.vue | 150 ++++++++++++++++++
admin/src/views/business/deviceRole.vue | 8
admin/vue.config.js | 7
admin/src/views/business/interfaceLog.vue | 17 -
admin/src/views/business/visitEvent.vue | 2
admin/src/views/business/internalMember.vue | 13
11 files changed, 373 insertions(+), 60 deletions(-)
diff --git a/admin/src/components/business/OperaDeviceRoleWindow.vue b/admin/src/components/business/OperaDeviceRoleWindow.vue
index 4910ac9..7b425b1 100644
--- a/admin/src/components/business/OperaDeviceRoleWindow.vue
+++ b/admin/src/components/business/OperaDeviceRoleWindow.vue
@@ -2,6 +2,7 @@
<GlobalWindow
:title="title"
:visible.sync="visible"
+ width="50%"
:confirm-working="isWorking"
@confirm="confirm"
>
@@ -23,9 +24,15 @@
<el-radio :label="0">鍏ㄩ儴闂ㄧ</el-radio>
<el-radio :label="1">閮ㄥ垎闂ㄧ</el-radio>
</el-radio-group>
- <el-checkbox-group v-model="form.doorIds" v-if="form.radio === 1">
- <el-checkbox :label="item.id" v-for="(item, index) in device" :key="index">{{item.name}}</el-checkbox>
- </el-checkbox-group>
+ <el-transfer
+ v-if="form.radio === 1"
+ style="margin-top: 15px;"
+ :titles="['鏈�夐棬绂佺粍', '宸查�夐棬绂佺粍']"
+ filterable
+ filter-placeholder="璇疯緭鍏ラ棬绂佺粍鍚嶇О"
+ v-model="form.doorIds"
+ :data="device">
+ </el-transfer>
</el-form-item>
</el-form>
</GlobalWindow>
@@ -148,7 +155,13 @@
getLists () {
getList({})
.then(res => {
- this.device = res
+ this.device = res.map(item => {
+ return {
+ label: item.name,
+ key: item.id
+ }
+ })
+ console.log(this.device)
})
},
changeRadio (e) {
@@ -176,3 +189,9 @@
}
}
</script>
+
+<style>
+ .el-transfer-panel {
+ width: 350px;
+ }
+</style>
diff --git a/admin/src/components/business/cardOpeningRecord.vue b/admin/src/components/business/cardOpeningRecord.vue
new file mode 100644
index 0000000..1b3502e
--- /dev/null
+++ b/admin/src/components/business/cardOpeningRecord.vue
@@ -0,0 +1,150 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="70%"
+ :visible.sync="visible"
+ :withFooter="false"
+ >
+ <ul style="width: 100%; display: flex; align-items: center; margin-bottom: 20px;">
+ <li style="margin-right: 10px;"><el-button type="primary" @click="batchLossReporting">鎸傚け</el-button></li>
+ <li><el-button type="primary" @click="batchDecoupling">瑙ｆ寕</el-button></li>
+ </ul>
+ <el-table
+ v-loading="loading"
+ :data="list"
+ stripe
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="code" label="鍗″彿" min-width="100px"></el-table-column>
+ <el-table-column prop="cardTypeName" label="鍗＄被鍨�" min-width="100px"></el-table-column>
+ <el-table-column label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.status === 0">绂佺敤</span>
+ <span v-if="row.status === 1">鍚敤</span>
+ <span v-if="row.status === 2">閫�鍗�</span>
+ <span v-if="row.status === 3">鎸傚け</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
+ <span v-if="row.memberType === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="memberName" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃/閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="寮�鍗℃椂闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" v-if="row.status === 3" @click="jiegua(row.id)">瑙ｆ寕</el-button>
+ <el-button type="text" v-if="row.status !== 3 && row.status !== 2" @click="tui(row.id)">閫�鍗�</el-button>
+ <el-button type="text" v-if="row.status !== 3 && row.status !== 2" @click="guashi(row.id)">鎸傚け</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ import { refundCard, batchLoss, batchUnLoss, fetchList } from '@/api/business/memberCard'
+ export default {
+ name: 'cardOpeningRecord',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ list: [],
+ tableData: {
+ selectedRows: []
+ },
+ loading: false
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/memberCard',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, memberId) {
+ this.title = title
+ this.visible = true
+ this.list = []
+ this.memberId = memberId
+ this.search()
+ },
+ handleSelectionChange (e) {
+ this.tableData.selectedRows = e
+ },
+ search() {
+ fetchList({
+ capacity: 9999,
+ page: 1,
+ model: {
+ memberId: this.memberId
+ }
+ }).then(res => {
+ this.list = res.records
+ })
+ },
+ // 鎵归噺瑙ｆ寕
+ batchDecoupling () {
+ let arr = []
+ this.tableData.selectedRows.forEach(item => {
+ arr.push({ id: item.id, status: 1 })
+ })
+ batchUnLoss(arr)
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ },
+ // 鎵归噺鎸傚け
+ batchLossReporting() {
+ let arr = []
+ this.tableData.selectedRows.forEach(item => {
+ arr.push({ id: item.id, status: 3 })
+ })
+ batchLoss(arr)
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ },
+ // 閫�鍗�
+ tui(id) {
+ refundCard({ id, status: 2 })
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ },
+ // 鎸傚け
+ guashi(id) {
+ batchLoss([{ id, status: 3 }])
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ },
+ // 瑙ｆ寕
+ jiegua(id) {
+ batchUnLoss([{ id, status: 1 }])
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ }
+ }
+ }
+</script>
diff --git a/admin/src/views/business/deletePersonnel.vue b/admin/src/views/business/deletePersonnel.vue
new file mode 100644
index 0000000..dd2ed88
--- /dev/null
+++ b/admin/src/views/business/deletePersonnel.vue
@@ -0,0 +1,143 @@
+<template>
+ <TableLayout :permissions="['business:member: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="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <!-- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
+ <!-- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绂诲満</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 label="鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type === 0">鍔冲姟璁垮</span>
+ <span v-if="row.type === 1">鏅�氳瀹�</span>
+ <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="inDate" label="鍏ュ満鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column label="瓒呮椂鏃堕暱" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.outStatus === 1">{{row.timeOut.toString().replace('-', '')}}鍒嗛挓</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.outStatus === 0">鏈秴鏃�</span>
+ <span style="color: red;" v-else-if="row.outStatus === 1">宸茶秴鏃�</span>
+ <span v-else-if="row.outStatus === 2">鍗冲皢瓒呮椂</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:member:update', 'business:member:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(row.id)">绂诲巶</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ </TableLayout>
+</template>
+
+<script>
+ import BaseTable from '@/components/base/BaseTable'
+ import TableLayout from '@/layouts/TableLayout'
+ import Pagination from '@/components/common/Pagination'
+ import { level } from '@/api/business/staging'
+ export default {
+ name: 'deletePersonnel',
+ extends: BaseTable,
+ components: { TableLayout, Pagination },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ companyName: '',
+ name: '',
+ type: '2',
+ isdeleted: 1
+ },
+ user: []
+ }
+ },
+ created () {
+ this.config({
+ module: '浜哄憳淇℃伅琛�',
+ api: '/business/strandedPersonnel',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods: {
+ departure(id) {
+ this.$confirm('纭畾绂诲満鍚�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ level(id)
+ .then(res => {
+ this.search()
+ })
+ }).catch(() => {
+
+ });
+ },
+ // thaws () {
+ // if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ // const ids = this.tableData.selectedRows.map(item => {
+ // return { id: item.id }
+ // })
+ // this.thaw(ids)
+ // },
+ // thaw (ids) {
+ // this.$confirm('纭畾绉婚櫎姝ょ敤鎴峰悧?', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning'
+ // }).then(() => {
+ // // updateRemoveStatusById(ids)
+ // // .then(res => {
+ // // this.$message.success('鎿嶄綔鎴愬姛')
+ // // this.search()
+ // // })
+ // }).catch(() => {
+ //
+ // })
+ // },
+ }
+ }
+</script>
diff --git a/admin/src/views/business/deviceRole.vue b/admin/src/views/business/deviceRole.vue
index 13129b7..776c49d 100644
--- a/admin/src/views/business/deviceRole.vue
+++ b/admin/src/views/business/deviceRole.vue
@@ -86,7 +86,7 @@
module: '闂ㄧ瑙掕壊',
api: '/business/deviceRole',
'field.id': 'id',
- 'field.main': 'id'
+ 'field.main': 'name'
})
this.search()
},
@@ -100,8 +100,10 @@
edit (row) {
if (row.doorIds) {
row.radio = 1
- row.doorIds = row.doorIds.split(',')
- row.doorIds = row.doorIds.map(item => Number(item))
+ if (typeof row.doorIds !== 'object') {
+ row.doorIds = row.doorIds.split(',')
+ row.doorIds = row.doorIds.map(item => Number(item))
+ }
} else {
row.radio = 0
row.doorIds = []
diff --git a/admin/src/views/business/interfaceLog.vue b/admin/src/views/business/interfaceLog.vue
index d9cfe3f..89642cd 100644
--- a/admin/src/views/business/interfaceLog.vue
+++ b/admin/src/views/business/interfaceLog.vue
@@ -6,15 +6,9 @@
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ帴鍙ｅ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="绫诲瀷" prop="type">
- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-select v-model="searchForm.type" @change="search" placeholder="璇烽�夋嫨">
<el-option label="璋冪敤" value="0"></el-option>
<el-option label="鎺ㄩ�佹帴鍙�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璋冪敤缁撴灉" prop="success">
- <el-select v-model="searchForm.success" placeholder="璇烽�夋嫨">
- <el-option label="鎴愬姛" value="0"></el-option>
- <el-option label="澶辫触" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="startDate">
@@ -47,12 +41,6 @@
<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 style="color: green;" v-if="row.success == 0">鎴愬姛</span>
- <span style="color: red;" v-if="row.success == 1">澶辫触</span>
</template>
</el-table-column>
<el-table-column label="骞冲彴" min-width="100px">
@@ -101,8 +89,7 @@
name: '',
type: '',
endDate: '',
- startDate: '',
- success: ''
+ startDate: ''
},
time: []
}
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index bd93eb6..5a065a8 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -17,7 +17,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
- <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>
+<!-- <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟')">鏂板缓</el-button></li>-->
<li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
</ul>
<el-table
@@ -32,17 +32,17 @@
<!-- <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="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="230"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', { disable: true, parentId: row.id })" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="鎿嶄綔"-->
+<!-- width="230"-->
+<!-- fixed="right"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>-->
+<!-- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', { disable: true, parentId: row.id })" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>-->
+<!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</template>
<!-- 鏂板缓/淇敼 -->
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 5b622eb..21cc600 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -95,6 +95,7 @@
<el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image
+ v-if="row.faceImg"
style="width: 60px; height: 60px"
:src="row.faceImg"
:preview-src-list="[row.faceImg]">
@@ -103,11 +104,7 @@
</el-table-column>
<el-table-column fixed="right" label="鍗＄墖淇℃伅" min-width="100px">
<template slot-scope="{row}">
- <el-image
- style="width: 60px; height: 60px"
- :src="row.faceImg"
- :preview-src-list="[row.faceImg]">
- </el-image>
+ <el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{row.memberCardCount || '0'}}</el-button>
</template>
</el-table-column>
<!-- <el-table-column-->
@@ -128,6 +125,8 @@
:pagination="tableData.pagination"
>
</pagination>
+ <!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
+ <cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -136,13 +135,14 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
+import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
import { fetchList } from '@/api/business/company'
import { memberSync } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree },
+ components: { TableLayout1, Pagination, Tree, cardOpeningRecord },
data () {
return {
TreeList: [],
@@ -203,7 +203,6 @@
.catch(() => {})
},
callback (row) {
- console.log(row)
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
this.search()
diff --git a/admin/src/views/business/parkBook.vue b/admin/src/views/business/parkBook.vue
index fe1acb8..406febd 100644
--- a/admin/src/views/business/parkBook.vue
+++ b/admin/src/views/business/parkBook.vue
@@ -68,20 +68,20 @@
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
-<!-- <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>-->
- <el-button type="text" @click="deleteById(row)" v-if="row.isdeleted !=1" icon="el-icon-delete" v-permissions="['business:parkbook:delete']">鍒犻櫎</el-button>
-<!--
- <el-button type="text" @click="reUpdate(row)" v-if="row.isdeleted !=1 && row.hkStatus ==0" icon="el-icon-edit" v-permissions="['business:parkbook:update']">绔嬪埢涓嬪彂</el-button>
--->
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
+<!-- label="鎿嶄綔"-->
+<!-- min-width="120"-->
+<!-- fixed="right"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!--<!– <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>–>-->
+<!-- <el-button type="text" @click="deleteById(row)" v-if="row.isdeleted !=1" icon="el-icon-delete" v-permissions="['business:parkbook:delete']">鍒犻櫎</el-button>-->
+<!--<!–-->
+<!-- <el-button type="text" @click="reUpdate(row)" v-if="row.isdeleted !=1 && row.hkStatus ==0" icon="el-icon-edit" v-permissions="['business:parkbook:update']">绔嬪埢涓嬪彂</el-button>-->
+<!--–>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index 44a9f49..edaa797 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -57,7 +57,7 @@
<el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
<el-table-column prop="beVisitedPersonOrg" label="琚浜虹粍缁�" min-width="100px"></el-table-column>
<el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column label="鎶撴媿鍥緐ri" min-width="100px">
+ <el-table-column label="鎶撴媿鍥�" min-width="100px">
<template slot-scope="{row}">
<el-image v-if="row.captureUrlFull!=null"
style="width: 80px; height: 80px"
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 9548afc..5df4993 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -19,6 +19,15 @@
<el-radio :label="1">鏄�</el-radio>
</el-radio-group>
</el-form-item>
+ <el-form-item label="鍏佽鑷�夐棬绂佺粍:" prop="doorsVisitRequired">
+ <el-switch
+ v-model="form.doorsVisitRequired"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </el-form-item>
<el-form-item label="璁垮鏄惁绛旈:" prop="isAnswer">
<el-switch
v-model="form.isAnswer"
@@ -82,6 +91,7 @@
reservationWay: 0,
healthCard: 0,
isAnswer: 0,
+ doorsVisitRequired: '',
theme: '',
description: '',
visitNotice: ''
@@ -135,6 +145,7 @@
this.form.isAnswer = res.isAnswer
this.form.reservationWay = res.reservationWay
this.form.theme = res.theme
+ this.form.doorsVisitRequired = res.doorsVisitRequired
this.form.visitNotice = res.visitNotice
})
},
@@ -146,7 +157,8 @@
reservationWay: this.form.reservationWay,
description: this.form.description,
theme: this.form.theme,
- visitNotice: this.form.visitNotice
+ visitNotice: this.form.visitNotice,
+ doorsVisitRequired: this.form.doorsVisitRequired
}).then(res => {
this.$message.success('淇濆瓨鎴愬姛')
this.getData()
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 149382e..ec8fd81 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -14,10 +14,11 @@
// http://192.168.0.110:10013 纾婄
// http://192.168.0.132:10013 甯呭摜
// http://192.168.0.126:10033 钀嶅
- // http://192.168.0.129:10028 浠诲悍
+ // http://192.168.0.186:10028 浠诲悍
// https://dmtest.ahapp.net/admin_api 娴嬭瘯鏈�
- // http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇
- target: 'http://192.168.0.186:10028',
+ // http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇锛堝唴缃戯級
+ // http://218.23.218.228:8018/admin_interface 鏈�鏂版祴璇曟湇锛堝缃戯級
+ target: 'http://218.23.218.228:8018/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
--
Gitblit v1.9.3