From c9fc6df4f99d82aa9a41d82ba2bb83c062144276 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 17 三月 2024 18:51:18 +0800
Subject: [PATCH] mrshi
---
h5/main.js | 5 +-
admin/src/plugins/messagebox.js | 7 +++
admin/src/components/business/OperaMemberCardWindow.vue | 10 ++++-
admin/src/views/business/empower.vue | 2
admin/src/views/business/deletePersonnel.vue | 6 +-
admin/src/components/business/cardOpeningRecord.vue | 9 +++-
admin/vue.config.js | 4 +
admin/src/views/business/visitEvent.vue | 6 +-
admin/src/views/business/internalMember.vue | 12 +++--
admin/src/views/business/memberCard.vue | 2
10 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/admin/src/components/business/OperaMemberCardWindow.vue b/admin/src/components/business/OperaMemberCardWindow.vue
index 2e6b272..67bf678 100644
--- a/admin/src/components/business/OperaMemberCardWindow.vue
+++ b/admin/src/components/business/OperaMemberCardWindow.vue
@@ -17,7 +17,7 @@
<el-option
v-for="item in member"
:key="item.id"
- :label="item.name"
+ :label="item.name + ' - ' + item.companyName"
:value="item.id">
</el-option>
</el-select>
@@ -75,12 +75,18 @@
api: '/business/memberCard',
'field.id': 'id'
})
- this.getMember()
+ // this.getMember()
},
methods: {
open (title, target) {
this.title = title
this.visible = true
+ if (target.isType === 1) {
+ this.getMember()
+ this.form.memberId = target.memberId
+ console.log(this.form.memberId)
+ return
+ }
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
diff --git a/admin/src/components/business/cardOpeningRecord.vue b/admin/src/components/business/cardOpeningRecord.vue
index 1b3502e..2dd095e 100644
--- a/admin/src/components/business/cardOpeningRecord.vue
+++ b/admin/src/components/business/cardOpeningRecord.vue
@@ -1,11 +1,12 @@
<template>
<GlobalWindow
:title="title"
- width="70%"
+ width="100%"
: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="$refs.operaMemberCardWindow.open('鏂板缓浜哄憳寮�鍗�', { memberId: memberId, isType: 1 })" v-permissions="['business:membercard:create']">鏂板缓</el-button></li>
<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>
@@ -49,19 +50,23 @@
</template>
</el-table-column>
</el-table>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaMemberCardWindow ref="operaMemberCardWindow" @success="search()"/>
</GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+ import OperaMemberCardWindow from '@/components/business/OperaMemberCardWindow'
import { refundCard, batchLoss, batchUnLoss, fetchList } from '@/api/business/memberCard'
export default {
name: 'cardOpeningRecord',
extends: BaseOpera,
- components: { GlobalWindow },
+ components: { GlobalWindow, OperaMemberCardWindow },
data () {
return {
+ memberId: null,
list: [],
tableData: {
selectedRows: []
diff --git a/admin/src/plugins/messagebox.js b/admin/src/plugins/messagebox.js
index c7a6b80..6aedbb3 100644
--- a/admin/src/plugins/messagebox.js
+++ b/admin/src/plugins/messagebox.js
@@ -10,6 +10,13 @@
type: 'warning'
})
},
+ actionConfirm (message, title) {
+ return MessageBox.confirm(message, title, {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ })
+ },
resetConfirm (message) {
return MessageBox.confirm(message, '閲嶇疆鎻愰啋', {
confirmButtonText: '纭閲嶇疆',
diff --git a/admin/src/views/business/deletePersonnel.vue b/admin/src/views/business/deletePersonnel.vue
index 563c32e..df3a125 100644
--- a/admin/src/views/business/deletePersonnel.vue
+++ b/admin/src/views/business/deletePersonnel.vue
@@ -2,8 +2,8 @@
<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 label="濮撳悕/鎵嬫満鍙�" prop="keyword">
+ <el-input v-model="searchForm.keyword" 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>
@@ -87,7 +87,7 @@
// 鎼滅储
searchForm: {
companyName: '',
- name: '',
+ keyword: '',
type: '2',
isdeleted: 1
},
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index ef8133b..00d6987 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -45,7 +45,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
- <li><el-button type="primary" v-permissions="['business:empower:create']">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>-->
<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>-->
</ul>
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 8fc5abb..b215a52 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -191,15 +191,17 @@
getfindCompanyTreePage () {
fetchList(1)
.then(res => {
- res[0].fsStatus = 1
- this.companyTree = res
- // this.searchForm.erpOrgId = res[0].erpId
- this.search()
+ if (res && res.length > 0) {
+ res[0].fsStatus = 1
+ this.companyTree = res
+ // this.searchForm.erpOrgId = res[0].erpId
+ this.search()
+ }
})
},
// 鍚屾淇℃伅
async synchronous () {
- this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
+ this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
memberSync({})
diff --git a/admin/src/views/business/memberCard.vue b/admin/src/views/business/memberCard.vue
index 707fcb0..a7d265c 100644
--- a/admin/src/views/business/memberCard.vue
+++ b/admin/src/views/business/memberCard.vue
@@ -30,7 +30,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:membercard:create']">
- <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('鏂板缓鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:membercard:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('鏂板缓浜哄憳寮�鍗�')" icon="el-icon-plus" v-permissions="['business:membercard:create']">鏂板缓</el-button></li>
<li><el-button type="primary" @click="batchLossReporting">鎸傚け</el-button></li>
<li><el-button type="primary" @click="batchDecoupling">瑙ｆ寕</el-button></li>
</ul>
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index edaa797..b3e1216 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -8,8 +8,8 @@
<el-form-item label="杞︾墝鍙�" prop="carNo">
<el-input v-model="searchForm.carNo" 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="visitorWorkUint">
+ <el-input v-model="searchForm.visitorWorkUint" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
<el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
@@ -97,7 +97,7 @@
startTime: '',
endTime: '',
eventType: '',
- companyName: '',
+ visitorWorkUint: '',
radio: '0'
},
time: []
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 3635cab..c856bf8 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -19,7 +19,9 @@
// http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇锛堝唴缃戯級
// http://218.23.218.228:8018/admin_interface 鏈�鏂版祴璇曟湇锛堝缃戯級
// target: 'http://218.23.218.228:8018/admin_interface',
- target: 'http://218.23.218.228:8018/admin_interface',
+ // http://218.23.218.228:9912/admin_interface
+ // http://facepay.huasunsolar.com/admin_interface
+ target: 'http://facepay.huasunsolar.com/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/h5/main.js b/h5/main.js
index 3cd2df4..4c4e332 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -7,9 +7,10 @@
Vue.config.productionTip = false
-Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
+// Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
-// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
+Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
+// Vue.prototype.$baseUrl = 'http://218.23.218.228:9912/web_interface/'
Vue.prototype.$store = store;
App.mpType = 'app'
--
Gitblit v1.9.3