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/AddProductDialog.vue | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 8bb5ebb..a1d1117 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.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>
@@ -39,7 +39,9 @@
<FormBtnsView
:add-product="addProduct"
@inOutBoundClick="inOutBoundClick"
+ @inLibraryClick="inLibraryClick"
:show-procure="showProcure"
+ :countObject="statisticsMap"
:show-sale="showSale"
/>
<div class="bottom">
@@ -163,7 +165,7 @@
:disabled="!showFooter"
>
<el-option
- v-for="item in productCategoryOptions"
+ v-for="item in productCategoryListWithDefault"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -472,13 +474,27 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit:false
}
}
}
},
components: {},
- computed: {},
+ computed: {
+ productCategoryListWithDefault(){
+ return [{id:0,name:'璇烽�夋嫨'},...(this.productCategoryOptions ?? [])]
+ },
+ modalTitle(){
+ if (this.editConfig.title === '缂栬緫' && this.editConfig.autoEdit){
+ return '缂栬緫'
+ }else if (this.editConfig.title === '缂栬緫') {
+ return !this.showEdit ? '缂栬緫' : '鏌ョ湅'
+ }else {
+ return '鏂板缓'
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
@@ -492,6 +508,7 @@
memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
+ { name: "璇烽�夋嫨", id: 0 },
{ name: "鑳芥秷鑰�", id: 1 },
{ name: "鏈嶅姟", id: 2 },
{ name: "鍙簱瀛樹骇鍝�", id: 3 }
@@ -524,7 +541,10 @@
{ name: "杈呮枡", id: "杈呮枡" },
{ name: "鑰楁潗", id: "鑰楁潗" },
{ name: "鍏朵粬", id: "鍏朵粬" }
- ]
+ ],
+ statisticsMap: {
+ inLibrary: 0 // 鍦ㄥ簱
+ }
}
},
created() {
@@ -532,6 +552,10 @@
this.getProductList()
this.setTableForm()
this.setBottonView()
+ this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ if (this.editConfig.autoEdit){
+ this.editClick()
+ }
},
methods: {
// 鑾峰彇浜у搧绫诲埆
@@ -724,6 +748,19 @@
})
}
},
+ // 鍦ㄥ簱鐐瑰嚮
+ inLibraryClick(){
+ if (this.editConfig.title !== "鏂板缓") {
+ console.log(this.editConfig.infomation)
+ this.$router.push({
+ name: "inventoryReport",
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id
+ }
+ })
+ }
+ },
// 鍙攢鍞�/鍙噰璐�
checkboxChange(val, param) {
if (val === "閲囪喘") {
--
Gitblit v1.8.0