From 301cbea766080fb65b8c6af563388b61606322f3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 14:23:25 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/productManage/product/index.vue | 76 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index f364068..0c79ece 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -14,29 +14,27 @@
<div class="icon-view">
<span
class="icon-label"
- @click="selIconSwitchClick('1')"
- :class="{ blueBackgroud: isIconIndex === '1', whiteBackgroud: isIconIndex === '2' }"
- ><i class="el-icon-menu"></i
- ></span>
- <span
- class="icon-label"
@click="selIconSwitchClick('2')"
:class="{ whiteBackgroud: isIconIndex === '1', blueBackgroud: isIconIndex === '2' }"
style="margin-left: 5px"
><i class="el-icon-s-unfold"></i
></span>
+ <span
+ class="icon-label"
+ @click="selIconSwitchClick('1')"
+ :class="{ blueBackgroud: isIconIndex === '1', whiteBackgroud: isIconIndex === '2' }"
+ ><i class="el-icon-menu"></i
+ ></span>
</div>
</div>
<!-- 鍥捐〃褰㈠紡 -->
<div v-if="isIconIndex === '1'" class="product-view">
- <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="tableRowClick(item)">
+ <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="showDetail(item)">
<div class="left">
<!-- <el-image style="width: 60px; height: 80px" :src="url"></el-image> -->
- <el-image class="img-view">
- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div>
- </el-image>
+ <div class="img-view">
+ <i class="el-icon-picture-outline"></i>
+ </div>
</div>
<div class="right">
<div class="label">
@@ -60,12 +58,20 @@
ref="tableListRef"
:table-list="tableList"
@selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
>
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90" align="center">
+ <template slot-scope="scope">
+ <span @click.stop="showDetail(scope.row)" class="cursor_pointer" style="margin-right: 10px">
+ <span style="color: #2a78fb">鏌ョ湅</span>
+ </span>
+ <span @click.stop="editRow(scope.row)" class="cursor_pointer">
+ <span style="color: #2a78fb">缂栬緫</span>
+ </span>
+ </template>
+ </el-table-column>
+ </template>
</TableCommonView>
- <!-- <div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
- </div> -->
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
@@ -91,7 +97,7 @@
data() {
return {
tableList: {},
- showcol: ["鍐呴儴鍙傝��", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
+ showcol: ["鍐呴儴缂栫爜", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
searchOptions: [],
commonDetail: {
visible: false,
@@ -101,21 +107,22 @@
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit: false
},
- isIconIndex: "1", // 1 鍥炬爣 2 鍒楄〃
+ isIconIndex: "2", // 1 鍥炬爣 2 鍒楄〃
url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
pageSizes: [15, 30],
keyWord: "",
- categoryId:null,
+ categoryId: null
}
},
created() {
this.setTable()
- let query = this.$route.query;
+ let query = this.$route.query
if (query) {
- this.categoryId = query.id ? Number(query.id) : null;
- this.pagerOptions.currPage=1
+ this.categoryId = query.id ? Number(query.id) : null
+ this.pagerOptions.currPage = 1
}
this.getData()
},
@@ -127,7 +134,8 @@
}
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -150,9 +158,9 @@
default: true
},
{
- label: "鍐呴儴鍙傝��",
+ label: "鍐呴儴缂栫爜",
prop: "internalReference",
- isShowColumn: showcol.includes("鍐呴儴鍙傝��"),
+ isShowColumn: showcol.includes("鍐呴儴缂栫爜"),
default: false
},
{
@@ -227,7 +235,7 @@
async getData() {
await getProductList({
keyWord: this.keyWord,
- categoryId:this.categoryId?this.categoryId:null,
+ categoryId: this.categoryId ? this.categoryId : null,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -255,12 +263,20 @@
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = {}
},
- // 琛岀偣鍑�
- tableRowClick(row) {
+ // 璇︽儏
+ showDetail(row) {
console.log(row)
this.editConfig.visible = true
+ this.editConfig.autoEdit = false
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
+ },
+ // 缂栬緫
+ editRow(row){
+ this.editConfig.autoEdit = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
},
// 鍒囨崲鍒楄〃灞曠幇褰㈠紡
selIconSwitchClick(value) {
@@ -367,7 +383,7 @@
}
}
.product-list {
- height: calc(100% - 65px);
+ height: calc(100% - 70px);
}
::v-deep {
.el-table {
--
Gitblit v1.8.0