From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/productManage/product/index.vue | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 2d5d8b8..c5855a4 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -5,8 +5,10 @@
:add-title="'鏂板缓'"
:placeholder="'璇疯緭鍏ヤ骇鍝佸悕绉�'"
:amount-view="false"
+ :search-task-map="searchTaskMap"
@addCommonClick="addBtnClick"
@searchClick="searchClick"
+ @delSelectClick="delSelectClick"
/>
</div>
<div class="list-view">
@@ -29,7 +31,7 @@
</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> -->
<div class="img-view">
@@ -54,16 +56,20 @@
</div>
<!-- 鍒楄〃褰㈠紡 -->
<div v-if="isIconIndex === '2'" class="product-list">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- >
+ <TableCommonView ref="tableListRef" :table-list="tableList" @selTableCol="selTableCol">
+ <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" />
@@ -89,7 +95,7 @@
data() {
return {
tableList: {},
- showcol: ["鍐呴儴鍙傝��", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
+ showcol: ["鍐呴儴缂栫爜", "璐熻矗浜�", "浜у搧鏍囩", "閿�鍞环鏍�", "鎴愭湰", "鍦ㄥ簱鏁伴噺", "棰勬祴鏁伴噺", "璁￠噺鍗曚綅"],
searchOptions: [],
commonDetail: {
visible: false,
@@ -99,21 +105,25 @@
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit: false
},
isIconIndex: "2", // 1 鍥炬爣 2 鍒楄〃
url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
pageSizes: [15, 30],
keyWord: "",
- categoryId: null
+ categoryId: null,
+ searchTaskMap: []
}
},
created() {
this.setTable()
let query = this.$route.query
if (query) {
+ console.log("ssssss")
this.categoryId = query.id ? Number(query.id) : null
this.pagerOptions.currPage = 1
+ this.searchTaskMap = query.id ? [{ categoryId: this.categoryId, title: query.categoryName }] : []
}
this.getData()
},
@@ -125,7 +135,8 @@
}
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -148,9 +159,9 @@
default: true
},
{
- label: "鍐呴儴鍙傝��",
+ label: "鍐呴儴缂栫爜",
prop: "internalReference",
- isShowColumn: showcol.includes("鍐呴儴鍙傝��"),
+ isShowColumn: showcol.includes("鍐呴儴缂栫爜"),
default: false
},
{
@@ -249,16 +260,24 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = {}
- },
- // 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row)
this.editConfig.visible = true
+ },
+ // 璇︽儏
+ showDetail(row) {
+ console.log(row)
+ this.editConfig.autoEdit = false
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
+ },
+ // 缂栬緫
+ editRow(row) {
+ this.editConfig.autoEdit = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
},
// 鍒囨崲鍒楄〃灞曠幇褰㈠紡
selIconSwitchClick(value) {
@@ -272,6 +291,11 @@
this.pagerOptions.pageSize = 15
}
this.getData()
+ },
+ // 鍒犻櫎浜у搧绫诲瀷
+ delSelectClick() {
+ this.categoryId = 0
+ this.getData()
}
}
}
--
Gitblit v1.8.0