From f2733edebdd17be85ade33122beb0ba07ea24125 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期三, 27 九月 2023 20:54:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/productManage/productCategory/index.vue | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/src/views/productManage/productCategory/index.vue b/src/views/productManage/productCategory/index.vue
index cdaaf4d..5dcca5f 100644
--- a/src/views/productManage/productCategory/index.vue
+++ b/src/views/productManage/productCategory/index.vue
@@ -3,32 +3,33 @@
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
- :placeholder="'璇疯緭鍏ュ崟鍙�'"
+ :placeholder="'璇疯緭鍏ヤ骇鍝佺被鍨�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
</div>
<div class="list-view">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- :show-checkcol="false"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ <div class="table">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ :show-checkcol="false"
+ @tableRowClick="tableRowClick"
+ ></TableCommonView>
+ </div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddProductCategoryDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddProductCategoryDialog v-if="editConfig.visible" :productCategoryList="tableList.tableInfomation" @refresh="refresh" :edit-common-config="editConfig" />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
-// import DetailProduct from "@/views/productManage/product/DetailProduct"
+import { getProductCategoryList } from "@/api/product/productCategory"
import AddProductCategoryDialog from "@/views/productManage/productCategory/AddProductCategoryDialog"
export default {
@@ -41,11 +42,6 @@
return {
tableList: {},
searchOptions: [],
- commonDetail: {
- visible: false,
- title: "鏂板缓",
- infomation: {}
- },
editConfig: {
visible: false,
title: "鏂板缓",
@@ -65,7 +61,7 @@
tableColumn: [
{
label: "浜у搧绫诲瀷",
- prop: "id",
+ prop: "name",
isShowColumn: true,
default: true
}
@@ -73,41 +69,46 @@
}
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getProductCategoryList({
+ keyword: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
- return {
- ...item,
- supplierNumber: item.supplier.number,
- status: "灏辩华",
- preTime: "2023-09-04 11:20:00"
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ if (res.code === 200) {
+ const list = res.data?res.data:[]
+ this.tableList.tableInfomation = list
+ this.pagerOptions.totalCount = res.total
}
})
},
+ refresh(){
+ this.pagerOptions.currPage=1
+ this.getData()
+ },
// 鎼滅储
getList(val) {
- console.log(val)
+ this.keyword=val;
+ this.pagerOptions.currPage=1
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation={
+ costingMethod:null,
+ forceRemovalStrategy:null,
+ inventoryValuation:null,
+ name:'',
+ parentId:null,
+ }
+ this.editConfig.visible = true
}
}
}
--
Gitblit v1.8.0