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/shop.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/shop.vue b/admin/src/views/business/shop.vue
index 6dc4b7e..7bf74de 100644
--- a/admin/src/views/business/shop.vue
+++ b/admin/src/views/business/shop.vue
@@ -29,9 +29,10 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:delete']">
- <li><el-button type="primary" @click="$refs.operaShopWindow.open('鏂板缓搴楅摵')" icon="el-icon-plus" v-permissions="['business:shop:create']">鏂板缓</el-button></li>
+ <ul class="toolbar" >
+ <li><el-button type="primary" @click="$refs.operaShopWindow.open('鏂板缓缁忛攢鍟�')" icon="el-icon-plus" v-permissions="['business:shop:create']">鏂板缓</el-button></li>
<!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:shop:delete']">鍒犻櫎</el-button></li> -->
+ <li><p class="tip-warn" style="width: 100%;margin-left: 20px;"><i class="el-icon-warning"></i>鎻愮ず锛氥�愪緵璐т环璁剧疆銆戝彧缁熻涓婃灦鐘舵�佺殑鍟嗗搧浠锋牸璁剧疆鏁版嵁,(宸插畾浠峰晢鍝佹暟/鍏ㄩ儴鍟嗗搧鏁�)</p></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -77,6 +78,11 @@
{{ row.saleType == 1?'鑷富閲囪喘':'骞冲彴閾鸿揣'}}
</template>
</el-table-column>
+ <el-table-column prop="shopPrice" label="渚涜揣浠疯缃�" min-width="100px" align="center">
+ <template slot-scope="{row}" >
+ <div title="閽堝涓婃灦鍟嗗搧浠锋牸璁剧疆缁熻" @click="goPriceSet(row)" style="cursor:pointer;"><span class="red"> {{row.pricedGoodsNum||0}}</span> / <span class="green"> {{row.goodsNum||0}}</span> </div>
+ </template>
+ </el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" align="center" min-width="100px" fixed="right">
<template slot-scope="{row}">
@@ -93,15 +99,15 @@
<el-table-column
v-if="containPermissions(['business:shop:update', 'business:shop:delete'])"
label="鎿嶄綔"
- min-width="200"
+ min-width="280"
fixed="right"
align="center"
>
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaShopWindow.open('缂栬緫缁忛攢鍟�', row)" icon="el-icon-edit" v-permissions="['business:shop:update']">缂栬緫</el-button>
+ <el-button type="text" v-permissions="['business:shop:update']" icon="el-icon-edit" @click="goPriceSet(row)">渚涜揣浠�</el-button>
<el-button type="text" @click="resetPwd(row)" icon="el-icon-edit" v-permissions="['business:shop:update']">閲嶇疆瀵嗙爜</el-button>
<el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:shop:delete']">鍒犻櫎</el-button>
-
</template>
</el-table-column>
</el-table>
@@ -114,8 +120,9 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaShopWindow ref="operaShopWindow" @success="handlePageChange"/>
- <OperaShopDetailWindow ref="operaShopDetailWindow" />
+ <OperaShopInfoWindow ref="OperaShopInfoWindow" />
<ResetPwdShopWindow ref="resetPwdWindow"/>
+ <OperaGoodsShopWindow ref="OperaGoodsShopWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -124,13 +131,14 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaShopWindow from '@/components/business/OperaShopWindow'
-import OperaShopDetailWindow from '@/components/business/OperaShopDetailWindow'
+import OperaShopInfoWindow from '@/components/business/OperaShopInfoWindow'
+import OperaGoodsShopWindow from '@/components/business/OperaGoodsShopWindow'
import { resetPwd, updateIsRecById } from '@/api/business/shop'
import ResetPwdShopWindow from '@/components/business/ResetPwdShopWindow'
export default {
name: 'Shop',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaShopWindow, OperaShopDetailWindow, ResetPwdShopWindow },
+ components: { TableLayout, Pagination, OperaShopWindow, OperaShopInfoWindow, ResetPwdShopWindow,OperaGoodsShopWindow },
data () {
return {
@@ -146,7 +154,7 @@
},
created () {
this.config({
- module: '搴楅摵鍩烘湰淇℃伅琛�',
+ module: '缁忛攢鍟嗗熀鏈俊鎭〃',
api: '/business/shop',
'field.id': 'id',
'field.main': 'id'
@@ -154,6 +162,9 @@
this.search()
},
methods: {
+ goPriceSet(row){
+ this.$refs.OperaGoodsShopWindow.open('璁剧疆渚涜揣浠� - '+row.name, row )
+ },
resetPwd (row) {
this.$dialog.messageWaring('纭閲嶇疆璇ョ粡閿�鍟嗐��' + row.name + '銆戠殑鐧诲綍瀵嗙爜鍚楋紵')
.then(() => {
@@ -184,7 +195,7 @@
})
},
showDetail (row) {
- this.$refs.operaShopDetailWindow.open('搴楅摵璇︽儏', row)
+ this.$refs.OperaShopInfoWindow.open('缁忛攢鍟嗚鎯呫��'+row.name+'銆�', row)
}
}
}
--
Gitblit v1.9.3