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 | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/integral.vue b/admin/src/views/business/integral.vue
index 4411132..97c4c1c 100644
--- a/admin/src/views/business/integral.vue
+++ b/admin/src/views/business/integral.vue
@@ -16,14 +16,21 @@
</el-form-item>
<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="1" :value="1" label="鎵ｉ櫎"></el-option>
+ <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="queryStartDate" >
+ <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"
@@ -32,9 +39,10 @@
placeholder="寮�濮嬫椂闂�"
></el-date-picker>
</el-form-item>
- <el-form-item label="-" label-width="10px" prop="queryEndDate" >
+ <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"
@@ -46,7 +54,9 @@
</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>
@@ -58,21 +68,20 @@
stripe
border
>
- <el-table-column prop="remark" label="娴佹按鍙�" align="center" min-width="100px"></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="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>
<pagination
@@ -102,6 +111,7 @@
userType: 0,
type: '',
starttime: '',
+ objType: null,
endtime: '',
orderCode: ''
}
@@ -128,7 +138,7 @@
this.searchForm.endDate = ''
this.$refs.searchForm.resetFields()
this.search()
- },
- },
+ }
+ }
}
</script>
--
Gitblit v1.9.3