From 0d0e67818a45161af14114211f43aafd232a6da2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 27 一月 2026 10:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/integral.vue | 126 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/admin/src/views/business/integral.vue b/admin/src/views/business/integral.vue
index 3e3947d..97c4c1c 100644
--- a/admin/src/views/business/integral.vue
+++ b/admin/src/views/business/integral.vue
@@ -2,35 +2,61 @@
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鏀舵敮绫诲瀷" prop="type">
- <el-select
- v-model="searchForm.type"
- placeholder="璇烽�夋嫨鏀舵敮绫诲瀷"
- @change="search"
- >
- <el-option :key="0" :value="0" label="鏀跺叆"></el-option>
- <el-option :key="1" :value="1" label="鏀嚭"></el-option>
+ <el-form-item label="鐢ㄦ埛" prop="nickName">
+ <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鑾峰緱/鎵ｉ櫎" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏀舵敮绫诲瀷" @change="search" >
+ <el-option :key="0" :value="0" label="鑾峰緱"></el-option>
+ <el-option :key="1" :value="1" label="鎵ｉ櫎"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="骞冲彴璁㈠崟鍙�" prop="orderCode">
+ <el-form-item label="鍏宠仈璁㈠崟鍙�" prop="orderCode">
<el-input v-model="searchForm.orderCode" placeholder="璇疯緭鍏ュ钩鍙拌鍗曞彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="createDate"
- type="daterange"
- value-format="yyyy-MM-dd"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- @change="selectDate"
- />
+ <el-form-item label="娑堣垂绫诲瀷" prop="objType">
+ <el-select v-model="searchForm.objType" placeholder="璇烽�夋嫨娑堣垂绫诲瀷" @change="search" >
+ <el-option :key="0" :value="0" label="娉ㄥ唽鎴愬姛"></el-option>
+ <el-option :key="3" :value="3" label="閭�璇峰ソ鍙嬪緱绉垎"></el-option>
+ <el-option :key="12" :value="12" label="绉垎鍙戞斁"></el-option>
+ <el-option :key="13" :value="13" label="绉垎鎵ｉ櫎"></el-option>
+ <el-option :key="9" :value="9" label="涓嬪崟鎶垫墸"></el-option>
+ <el-option :key="14" :value="14" label="鍙栨秷璁㈠崟閫�鍥�"></el-option>
+ <el-option :key="15" :value="15" label="娑堣垂杩旂Н鍒�"></el-option>
+ <el-option :key="18" :value="18" label="绉垎杩囨湡"></el-option>
+ </el-select>
</el-form-item>
+ <div class="date-style" style="display: inline">
+ <el-form-item label="鍙樺姩鏃堕棿" prop="starttime" >
+ <el-date-picker
+ style="width: 160px"
+ clearable
+ v-model="searchForm.starttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="寮�濮嬫椂闂�"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="-" label-width="10px" prop="endtime" >
+ <el-date-picker
+ style="width: 160px"
+ clearable
+ v-model="searchForm.endtime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="鎴鏃堕棿"
+ ></el-date-picker>
+ </el-form-item>
+ </div>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
+<!--
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:integral:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+-->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -42,36 +68,21 @@
stripe
border
>
- <el-table-column prop="remark" label="娴佹按鍙�" align="center" min-width="100px"></el-table-column>
- <el-table-column label="鐢ㄦ埛" align="center" min-width="100px">
- <template slot-scope="{row}">
- <div style="display: flex; line-height: 50px;">
- <el-image style="with:50px;height:50px;margin-right: 10px;" :scr="row.imgurlfull" :preview-src-list="[row.imgurlfull]"></el-image>
- {{ row.nickName }}
- </div>
- </template>
- </el-table-column>
+<!-- <el-table-column prop="remark" label="娴佹按鍙�" align="center" min-width="100px"></el-table-column>-->
+ <el-table-column prop="nickName" label="鐢ㄦ埛" align="center" min-width="100px"> </el-table-column>
<el-table-column prop="phone" align="center" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="type" align="center" label="鏀舵敮绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- {{ row.type==0?'鏀跺叆':'鏀嚭' }}
+ <span v-if="row.type==0" class="green">鑾峰緱</span>
+ <span v-else class="red">鎵ｉ櫎</span>
</template>
</el-table-column>
- <el-table-column prop="num" align="center" label="鍜栬眴" min-width="100px"></el-table-column>
- <el-table-column prop="totalNum" align="center" label="鍜栬眴浣欓" min-width="100px"></el-table-column>
- <el-table-column prop="type" align="center" label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <!-- 0骞冲彴娉ㄥ唽 1绛惧埌 2鍒嗕韩閭�璇� 3閭�璇锋柊鐢ㄦ埛 4鍏戞崲鍟嗗搧 -->
- {{ row.objId==0?'骞冲彴娉ㄥ唽'
- :row.objId==1?'绛惧埌'
- :row.objId==2?'鍒嗕韩閭�璇�'
- :row.objId==3?'閭�璇锋柊鐢ㄦ埛':'鍏戞崲鍟嗗搧'
- }}
- </template>
- </el-table-column>
+ <el-table-column prop="num" align="center" label="鏁伴噺" min-width="100px"></el-table-column>
+ <el-table-column prop="totalNum" align="center" label="褰撳墠浣欓" min-width="100px"></el-table-column>
+ <el-table-column prop="strObjType" align="center" label="娑堣垂绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="content" align="center" label="鍙樺姩鍐呭" min-width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="orderCode" align="center" label="浜ゆ槗鍗曞彿" min-width="100px"></el-table-column>
- <el-table-column prop="content" align="center" label="鏀舵敮璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" align="center" label="鍙樺姩鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -96,24 +107,11 @@
createDate: [],
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
- memberId: '',
- title: '',
- content: '',
- objId: '',
- objType: '',
- type: '',
- num: '',
- totalNum: '',
-
+ nickName: '',
+ userType: 0,
type: '',
starttime: '',
+ objType: null,
endtime: '',
orderCode: ''
}
@@ -127,7 +125,7 @@
'field.main': 'id'
})
this.search()
- },
+ },
methods: {
selectDate(v) {
this.searchForm.starttime = v[0] + '00:00:00'
@@ -140,7 +138,7 @@
this.searchForm.endDate = ''
this.$refs.searchForm.resetFields()
this.search()
- },
- },
+ }
+ }
}
</script>
--
Gitblit v1.9.3