From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/empower.vue | 229 +++++++++++++++++++++++++++-----------------------------
1 files changed, 111 insertions(+), 118 deletions(-)
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index 358967b..8aff320 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -1,114 +1,103 @@
<template>
- <TableLayout :permissions="['business:empower:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕鎵嬫満鍙�" prop="memberName">
- <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
- <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <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-select>
- </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="deviceName">
- <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="涓嬪彂璧峰鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <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:empower:create', 'business:empower:delete']">
- <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>
- <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="memberName" label="濮撳悕" min-width="80px"></el-table-column>
- <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
- <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
- <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
- <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
- <template slot-scope="{row}">
- <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
- <div v-else>
- <span>璧凤細{{row.startTime}}</span><br />
- <span>姝細{{row.endTime}}</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column label="鏄惁鍒犻櫎" min-width="100px">
- <template slot-scope="{row}">
- <span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
- <span style="color: red;" v-if="row.isdeleted === 1">鏄�</span>
- </template>
- </el-table-column>
-<!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
- <el-table-column label="涓嬪彂鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sendStatus === 0">寰呬笅鍙�</span>
- <span v-if="row.sendStatus === 1">浠诲姟鎵ц</span>
- <span v-if="row.sendStatus === 2">涓嬪彂鎴愬姛</span>
- <span v-if="row.sendStatus === 3">宸插彇娑�</span>
- <span v-if="row.sendStatus === 4">涓嬪彂澶辫触</span>
- <span v-if="row.sendStatus === 5">浠诲姟涓嬭浇宸茬粨鏉�</span>
- <span v-if="row.sendStatus === 6">涓嶇鍚堜笅鍙戞潯浠�</span>
- </template>
- </el-table-column>
- <el-table-column prop="sendType" label="涓嬪彂绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.sendType === 0">瀹炴椂</span>
- <span v-if="row.sendType === 1">瀹氭椂</span>
- </template>
- </el-table-column>
- <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:empower:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
+ <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+ <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-select>
+ </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="deviceName">
+ <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="涓嬪彂璧峰鏃堕棿" prop="">
+ <!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.sendStartDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.sendEndDate" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <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:empower:create', 'business:empower:delete']">
+ <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>
+ <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="memberName" label="濮撳悕" min-width="80px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
+ <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
+ <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
+ <template slot-scope="{row}">
+ <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
+ <div v-else>
+ <span>璧凤細{{ row.startTime }}</span><br />
+ <span>姝細{{ row.endTime }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鏄惁鍒犻櫎" min-width="100px">
+ <template slot-scope="{row}">
+ <span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
+ <span style="color: red;" v-if="row.isdeleted === 1">鏄�</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
+ <el-table-column label="涓嬪彂鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.sendStatus === 0">寰呬笅鍙�</span>
+ <span v-if="row.sendStatus === 1">浠诲姟鎵ц</span>
+ <span v-if="row.sendStatus === 2">涓嬪彂鎴愬姛</span>
+ <span v-if="row.sendStatus === 3">宸插彇娑�</span>
+ <span v-if="row.sendStatus === 4">涓嬪彂澶辫触</span>
+ <span v-if="row.sendStatus === 5">浠诲姟涓嬭浇宸茬粨鏉�</span>
+ <span v-if="row.sendStatus === 6">涓嶇鍚堜笅鍙戞潯浠�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sendType" label="涓嬪彂绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.sendType === 0">瀹炴椂</span>
+ <span v-if="row.sendType === 1">瀹氭椂</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -120,7 +109,7 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -137,7 +126,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳鎺堟潈瀵煎叆璁板綍',
api: '/business/empower',
@@ -148,30 +137,34 @@
this.search()
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
this.searchForm.sendStartDate = timeForMat(0)[0]
this.searchForm.sendEndDate = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.sendStartDate = timeForMat(6)[0]
this.searchForm.sendEndDate = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.sendStartDate = timeForMat(29)[0]
this.searchForm.sendEndDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.sendStartDate && this.searchForm.sendEndDate && new Date(this.searchForm.sendStartDate).getTime() > new Date(this.searchForm.sendEndDate).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.sendStartDate = ''
+ return
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.sendStartDate = e[0]
this.searchForm.sendEndDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm = {}
this.time = []
--
Gitblit v1.9.3