From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/backgroundRefund.vue | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/backgroundRefund.vue b/admin/src/views/business/backgroundRefund.vue
index 607889c..fe30b0c 100644
--- a/admin/src/views/business/backgroundRefund.vue
+++ b/admin/src/views/business/backgroundRefund.vue
@@ -3,24 +3,26 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="openid">
+ <el-form-item label="鎿嶄綔鏃堕棿">
<el-date-picker
v-model="value1"
type="daterange"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
@change="selectDate"
></el-date-picker>
</el-form-item>
- <el-form-item label="鎿嶄綔浜�" prop="creator">
- <el-select v-model="searchForm.creator" placeholder="璇烽�夋嫨">
+ <el-form-item label="鎿嶄綔浜�" prop="creatorName">
+ <el-input v-model="searchForm.creatorName" placeholder="璇疯緭鍏ユ搷浣滀汉" v-trim/>
+ <!-- <el-select v-model="searchForm.creator" placeholder="璇烽�夋嫨">
<el-option label="鏈綊杩�" :value="1">
</el-option>
<el-option label="宸插綊杩�" :value="1">
</el-option>
- </el-select>
+ </el-select> -->
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -36,17 +38,32 @@
</li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border>
- <el-table-column prop="openid" label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column>
- <el-table-column prop="payOnlineOrderid" label="绯荤粺鍗曞彿" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="openid" label="鐢ㄦ埛" min-width="140px" align="center" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <div class="long-title-style">{{ row.openid }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="objId" label="绯荤粺鍗曞彿" min-width="140px" align="center" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <div class="long-title-style">{{ row.objId }}</div>
+ </template>
+ </el-table-column>
<!-- payOnlineOrderid 鏀粯鎶奸噾浜ゆ槗鍗曞彿 -->
<!-- onlineOrderid 鍦ㄧ嚎浜ゆ槗鍗曞彿 -->
<!-- preOrderid 浜ゆ槗棰勮鍗曞彿 -->
- <el-table-column prop="onlineOrderid" label="浜ゆ槗鍗曞彿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="canBalance" label="褰撳墠鍙��鍥炴娂閲�(鍏�)" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="money" label="閫�鍥炴娂閲�(鍏�)" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="onlineOrderid" label="浜ゆ槗鍗曞彿" min-width="140px" align="center" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <div class="long-title-style">{{ row.onlineOrderid }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="canBalance" label="褰撳墠鍙��鍥炴娂閲�(鍏�)" min-width="140px" align="center">
+
+ </el-table-column>
+ <el-table-column prop="money" label="閫�鍥炴娂閲�(鍏�)" min-width="140px" align="center">
+ </el-table-column>
<el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="creator" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="actReason" label="鍘熷洜" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="creatorName" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="reason" label="鍘熷洜" min-width="100px" align="center"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
@@ -69,7 +86,7 @@
searchForm: {
startDate: '',
endDate: '',
- creator: '',
+ creatorName: '',
},
}
},
@@ -96,6 +113,7 @@
this.searchForm.startDate = ''
this.searchForm.endDate = ''
this.value1 = []
+ this.$refs.searchForm.resetFields()
this.search()
},
},
--
Gitblit v1.9.3