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/productCategory/AddProductCategoryDialog.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index e0833be..2f86a71 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '浜у搧绫诲埆'"
+ :title="modalTitle + '浜у搧绫诲埆'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "浜у搧绫诲埆" }}</span>
+ <span>{{ modalTitle + "浜у搧绫诲埆" }}</span>
<div class="header_btns">
<!-- <span class="btn">
<i class="el-icon-printer"></i>
@@ -38,7 +38,7 @@
size="mini"
>
<div class="basic-info">
- <FormBtnsView :showProduct="true" @productClick="productClick" />
+ <FormBtnsView :showProduct="true" :countObject="statisticsMap" @productClick="productClick" />
<div class="basic-info-view">
<!-- <el-row> -->
<!-- <el-col :span="24">
@@ -88,7 +88,7 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in productCategoryListWithDefault" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -173,6 +173,7 @@
import { addProductCategory, updateProductCategory, deleteProductCategory } from "@/api/product/productCategory"
import { getDataByType } from "@/api/data"
+import {getProductList} from "@/api/product/product";
export default {
name: "AddProductCategoryDialog",
props: {
@@ -182,7 +183,8 @@
return {
visible: false,
title: "鏂板缓",
- infomation: { type: [] }
+ infomation: { type: [] },
+ autoEdit: false,
}
}
},
@@ -194,7 +196,20 @@
}
},
components: {},
- computed: {},
+ computed: {
+ productCategoryListWithDefault(){
+ return [{id:0,name:'璇烽�夋嫨'},...(this.productCategoryList?? [])]
+ },
+ modalTitle(){
+ if (this.editConfig.title === '缂栬緫' && this.editConfig.autoEdit){
+ return '缂栬緫'
+ }else if (this.editConfig.title === '缂栬緫') {
+ return !this.showEdit ? '缂栬緫' : '鏌ョ湅'
+ }else {
+ return '鏂板缓'
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
@@ -212,13 +227,38 @@
showButton: true,
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
- showFooter: false // 鏄惁鏄剧ず鍙栨秷淇濆瓨
+ showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨,
+ statisticsMap:{
+ product: 0 // 浜у搧鏁伴噺
+ }
}
},
created() {
this.setBottonView()
+ this.getProductCount()
+ if (this.editConfig.autoEdit){
+ this.editClick()
+ }
},
methods: {
+ // 鑾峰彇浜у搧鏁伴噺
+ getProductCount(){
+ getProductList({
+ keyWord: '',
+ categoryId: this.editConfig.title === "鏂板缓" ? null : this.editConfig.infomation.id,
+ page: 1,
+ pageSize: 1
+ }).then((res) => {
+ if (res.code === 200) {
+ this.statisticsMap.product = res?.total ?? 0
+ }else{
+ this.statisticsMap.product = 0
+ }
+ }).catch(err=>{
+ console.error(err)
+ this.statisticsMap.product = 0
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
--
Gitblit v1.8.0