From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
admin/src/views/business/platformGoods.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/business/platformGoods.vue b/admin/src/views/business/platformGoods.vue
index 885cc8c..54d6679 100644
--- a/admin/src/views/business/platformGoods.vue
+++ b/admin/src/views/business/platformGoods.vue
@@ -1,7 +1,7 @@
<template>
<TableLayout :permissions="['business:goods:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" >
<el-form-item label="鍟嗗搧鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -72,16 +72,21 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="imgurl" label="鍟嗗搧淇℃伅" min-width="80px">
+ <el-table-column prop="imgurl" label="鍟嗗搧涓诲浘" min-width="80px">
<template slot-scope="{row}">
<el-image style="width: 50px;height: 50px;" v-if="row.imgurl && row.imgurl!=''" :src="row.resourcePath+row.imgurl" :preview-src-list="[row.resourcePath+row.imgurl]"></el-image>
</template>
</el-table-column>
- <el-table-column prop="id" label="鍟嗗搧ID" min-width="150px" ></el-table-column>
+ <el-table-column prop="id" label="鍟嗗搧ID" min-width="150px" >
+ <template slot-scope="{row}">
+ <span class="blue" style="cursor: pointer" @click="$refs.OperaGoodsInfoWindow.open('鍟嗗搧璇︽儏', row, 0)">{{row.id}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="categoryName" label="鎵�灞炲垎绫�" min-width="120px"></el-table-column>
<el-table-column prop="brandName" label="鎵�灞炲搧鐗�" min-width="120px"></el-table-column>
- <el-table-column prop="price" label="灞曠ず浠锋牸" min-width="100px"></el-table-column>
+ <el-table-column prop="showPrice" label="鍑哄巶浠�(鍏冿級" min-width="100px"></el-table-column>
+ <el-table-column prop="price" label="鍒掔嚎浠�(鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="skuPrice" label="閿�鍞环(鍏�)" min-width="100px"></el-table-column>
<el-table-column prop="shopPrice" label="渚涜揣浠疯缃�" min-width="100px" align="center">
<template slot-scope="{row}" >
@@ -89,6 +94,7 @@
</template>
</el-table-column>
<el-table-column prop="stockNum" label="鍓╀綑搴撳瓨閲�" min-width="100px"></el-table-column>
+ <el-table-column prop="salenum" label="鍒濆閿�閲�" min-width="100px"></el-table-column>
<el-table-column prop="salesVolume" label="瀹為檯閿�閲�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column prop="status" label="涓婁笅鏋剁姸鎬�" min-width="100px" fixed="right" align="center">
@@ -112,7 +118,6 @@
<el-button type="text" v-if="row.status == 1" @click="$refs.operaGoodsWindow.open('缂栬緫鍟嗗搧', row, 0)" v-permissions="['business:goods:update']">缂栬緫</el-button>
<el-button type="text" v-permissions="['business:goods:update']" @click="goPriceSet(row)">渚涜揣浠�</el-button>
<el-button type="text" style="color: red;" @click="deleteById(row)" v-permissions="['business:goods:delete']">鍒犻櫎</el-button>
- <!-- <el-button type="text" @click="$refs.operaGoodsDetailWindow.open('鍟嗗搧璇︽儏', row, 0)">鏌ョ湅璇︽儏</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -125,7 +130,7 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaGoodsWindow ref="operaGoodsWindow" @success="handlePageChange"/>
- <OperaGoodsDetailWindow ref="operaGoodsDetailWindow"/>
+ <OperaGoodsInfoWindow ref="OperaGoodsInfoWindow"/>
<OperaPlatformGoodsSkuWindow ref="operaPlatformGoodsSkuWindow"/>
<OperaShopGoodsWindow ref="OperaShopGoodsWindow" @success="priceSuccess"/>
</TableLayout>
@@ -136,14 +141,14 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaGoodsWindow from '@/components/business/OperaGoodsWindow'
-import OperaGoodsDetailWindow from '@/components/business/OperaGoodsDetailWindow'
+import OperaGoodsInfoWindow from '@/components/business/OperaGoodsInfoWindow'
import OperaPlatformGoodsSkuWindow from '@/components/business/OperaPlatformGoodsSkuWindow'
import OperaShopGoodsWindow from '@/components/business/OperaShopGoodsWindow'
import { findAll as labelList } from '@/api/business/labels'
export default {
name: 'Goods',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaGoodsWindow, OperaGoodsDetailWindow, OperaPlatformGoodsSkuWindow, OperaShopGoodsWindow },
+ components: { TableLayout, Pagination, OperaGoodsWindow, OperaGoodsInfoWindow, OperaPlatformGoodsSkuWindow, OperaShopGoodsWindow },
data () {
return {
activeName: 'first',
--
Gitblit v1.9.3