From 25b727a5dc28f3c2d225c5e017da58f35c6b84b3 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期二, 26 九月 2023 19:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/productManage/product/AddProductDialog.vue | 115 ++++++++++++++++++++++++---------------------------------
1 files changed, 48 insertions(+), 67 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 3900892..b939663 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -36,7 +36,6 @@
<el-button plain size="mini" disabled>鏇存柊鏁伴噺</el-button>
<el-button plain size="mini" disabled>鎵ц琛ヨ揣</el-button>
</div>
-
<div class="basic-info">
<FormBtnsView
:add-product="addProduct"
@@ -130,7 +129,6 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
-
<el-form-item label="浜у搧鏍囩" prop="productTagName" style="margin-left: 20px">
<el-input
v-model="editConfig.infomation.productTagName"
@@ -245,7 +243,6 @@
</el-checkbox-group>
</el-form-item>
</div> -->
-
<div class="left">
<el-form-item label="璐熻矗浜�" prop="principal" style="margin-left: 20px" label-width="80px">
<el-select
@@ -287,6 +284,40 @@
<div class="right">
<el-form-item
label="鍒堕�犲墠缃椂闂�"
+ prop="makeAdvanceTime"
+ style="margin-left: 20px"
+ label-width="130px"
+ >
+ <el-input-number
+ v-model="editConfig.infomation.makeAdvanceTime"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="0"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> 澶╂暟</span>
+ </el-form-item>
+ <el-form-item
+ label="鐢熶骇璁㈠崟鍑嗗澶╂暟"
+ prop="orderAdvanceTime"
+ style="margin-left: 20px"
+ label-width="130px"
+ >
+ <el-input-number
+ v-model="editConfig.infomation.orderAdvanceTime"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="0"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> 澶╂暟</span>
+ </el-form-item>
+ <el-form-item
+ label="瀹㈡埛鍓嶇疆鏃堕棿"
prop="deliveryAdvanceTime"
style="margin-left: 20px"
label-width="130px"
@@ -300,37 +331,7 @@
style="width: 85%"
:disabled="!showFooter"
></el-input-number>
- <span> 澶╂暟</span>
- </el-form-item>
- <el-form-item
- label="鐢熶骇璁㈠崟鍑嗗澶╂暟"
- prop="customerTaxes"
- style="margin-left: 20px"
- label-width="130px"
- >
- <el-input-number
- v-model="editConfig.infomation.customerTaxes"
- placeholder="璇疯緭鍏�"
- :min="0"
- :precision="0"
- :controls="false"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input-number>
- <span> 澶╂暟</span>
- </el-form-item>
- <el-form-item label="瀹㈡埛鍓嶇疆鏃堕棿" prop="aaa" style="margin-left: 20px" label-width="130px">
- <el-select
- v-model="editConfig.infomation.aaa"
- multiple
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in aaaOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
+ <span> 澶�</span>
</el-form-item>
</div>
</div>
@@ -483,7 +484,6 @@
</el-form>
<!-- 灏� -->
<div v-if="showFooter" slot="footer" class="dialog-footer">
- <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
<el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
@@ -523,12 +523,7 @@
salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
},
- memberOptions: [
- {
- name: "admin",
- id: 1
- }
- ],
+ memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
{ name: "鑳芥秷鑰�", id: 1 },
@@ -543,7 +538,7 @@
showButton: true,
activeName: "first",
productTableList: {},
- tableData: [{ name: "ssss" }],
+ tableData: [],
isNoProduct: false, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
@@ -557,30 +552,12 @@
showProcure: true,
showSale: true,
materialTypeList: [
- {
- name: "鍘熸潗鏂�",
- id: "鍘熸潗鏂�"
- },
- {
- name: "鍗婃垚鍝�",
- id: "鍗婃垚鍝�"
- },
- {
- name: "鎴愬搧",
- id: "鎴愬搧"
- },
- {
- name: "杈呮枡",
- id: "杈呮枡"
- },
- {
- name: "鑰楁潗",
- id: "鑰楁潗"
- },
- {
- name: "鍏朵粬",
- id: "鍏朵粬"
- }
+ { name: "鍘熸潗鏂�", id: "鍘熸潗鏂�" },
+ { name: "鍗婃垚鍝�", id: "鍗婃垚鍝�" },
+ { name: "鎴愬搧", id: "鎴愬搧" },
+ { name: "杈呮枡", id: "杈呮枡" },
+ { name: "鑰楁潗", id: "鑰楁潗" },
+ { name: "鍏朵粬", id: "鍏朵粬" }
]
}
},
@@ -771,7 +748,11 @@
// 杩涘嚭鐐瑰嚮
inOutBoundClick() {
if (this.editConfig.title !== "鏂板缓") {
- this.$router.push({ path: "/reportForm/inOutboundDetail", query: { name: "浜у搧鍚嶇О/鍑哄叆搴撴槑缁�" } })
+ console.log(this.editConfig.infomation)
+ this.$router.push({
+ name: "inOutboundDetail",
+ params: { name: this.editConfig.infomation.name, id: this.editConfig.infomation.id }
+ })
}
},
// 鍙攢鍞�/鍙噰璐�
--
Gitblit v1.8.0