From c261cb7ff2e4cfce233d02c6aca9e8f85e8ba1ba Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 20 一月 2026 18:05:08 +0800
Subject: [PATCH] 经销商管理
---
admin/src/components/business/OperaShopInfoWindow.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/admin/src/components/business/OperaShopInfoWindow.vue b/admin/src/components/business/OperaShopInfoWindow.vue
index 38cdded..05c8b55 100644
--- a/admin/src/components/business/OperaShopInfoWindow.vue
+++ b/admin/src/components/business/OperaShopInfoWindow.vue
@@ -175,21 +175,17 @@
stripe
border
>
- <el-table-column prop="type" label="鑾峰緱/鎵ｉ櫎" align="center" min-width="150px">
+ <el-table-column prop="code" label="璁㈠崟缂栧彿" align="center" min-width="120px" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="details" label="鍟嗗搧淇℃伅" align="center" min-width="250px" show-overflow-tooltip>
<template slot-scope="{row}">
- <span v-if="row.type==0" class="green">鑾峰緱</span>
- <span v-else class="red">鎵ｉ櫎</span>
- </template>
- </el-table-column>
- <el-table-column prop="code" label="璁㈠崟缂栧彿" fixed align="center" min-width="100px"> </el-table-column>
- <el-table-column prop="details" label="鍟嗗搧淇℃伅" fixed align="center" min-width="100px">
- <template slot-scope="{row}">
- <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length" >
- <div v-for="(item) in row.goodsorderDetailList">銆恵{item.name}}銆戦攢鍞环锛歿{item.price||0}} 鏁伴噺锛歿{item.goodsNum||0}}</div>
+ <div v-if="row.goodsorderDetailList && row.goodsorderDetailList.length" style="width: 220px">
+ <div v-for="(item) in row.goodsorderDetailList" style="display: flex">
+ <div style="flex: 1">銆恵{item.name}}銆�</div><div style="flex: 1">閿�鍞环锛歿{item.price||0}} 鏁伴噺锛歿{item.goodsNum||0}}</div>
+ </div>
</div>
</template>
</el-table-column>
- <el-table-column prop="price" label="鍟嗗搧鎬讳环锛堝厓锛�" align="center" min-width="100px">
+ <el-table-column prop="price" label="鍟嗗搧鎬讳环(鍏�)" align="center" min-width="100px">
<template slot-scope="{row}">
{{(row.totalPrice || 0) - (row.mailPrice||0)}}
</template>
@@ -203,10 +199,16 @@
</el-table-column>
<el-table-column prop="price" label="瀹炰粯浠锋牸(鍏�)" align="center" min-width="200px"></el-table-column>
<el-table-column prop="shopSettlement" label="搴旂粨绠楅噾棰�(鍏�)" align="center" min-width="150px"></el-table-column>
- <el-table-column prop="orderCode" label="搴旂粨绠楅噾棰�(鍏�)" align="center" min-width="150px"></el-table-column>
- <el-table-column prop="orderCode" label="杩旂敤鎴风Н鍒�" align="center" min-width="150px"></el-table-column>
- <el-table-column prop="orderCode" label="杩旂粡閿�鍟嗙Н鍒�" align="center" min-width="150px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓" align="center" min-width="200px"></el-table-column>
+ <el-table-column prop="returnMemberIntegral" label="杩旂敤鎴风Н鍒�" align="center" min-width="150px"></el-table-column>
+ <el-table-column prop="returnCustomerIntegral" label="杩旂粡閿�鍟嗙Н鍒�" align="center" min-width="150px"></el-table-column>
+ <el-table-column prop="payDate" label="鏀粯鏃堕棿" align="center" min-width="200px"></el-table-column>
+ <el-table-column prop="receiveType" label="鍙栬揣鏂瑰紡" align="center" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.receiveType === 0" class="green">閰嶉��</span>
+ <span v-else class="red">鑷彁</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="200px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange1"
@@ -237,7 +239,7 @@
</div>
</div>
<div style="float: right; margin-bottom: 20px;">
- <el-select v-model="searchForm2.type" placeholder="鍏ㄩ儴" clearable @change="search" style="width: 120px;" >
+ <el-select v-model="searchForm2.type" placeholder="鍏ㄩ儴" clearable @change="handlePageChange2(1)" style="width: 120px;" >
<el-option :key="0" :value="0" label="鑾峰緱" ></el-option>
<el-option :key="1" :value="1" label="鎵ｉ櫎" ></el-option>
</el-select>
--
Gitblit v1.9.3