From 5de621e943d9605d10e2ac5d46658c0626a68caa Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 07 三月 2024 10:11:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/SRM
---
src/views/purchaseManage/purchase/components/AddPurchase.vue | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index f782552..38d1c0e 100644
--- a/src/views/purchaseManage/purchase/components/AddPurchase.vue
+++ b/src/views/purchaseManage/purchase/components/AddPurchase.vue
@@ -54,7 +54,7 @@
>
<el-option
v-for="ele in plcBrandList"
- :key="ele.name"
+ :key="ele.purchaseTypeId"
:label="ele.name"
:value="ele.id"
></el-option>
@@ -97,11 +97,11 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鍗曟嵁鏉ユ簮" prop="orderSource">
<el-input v-model="editConfig.infomation.orderSource" disabled placeholder="璇峰～鍐�"></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="閲囪喘鍗曞悕绉�" prop="name">
<el-input
@@ -160,6 +160,38 @@
value-format="yyyy-MM-dd"
>
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣浠撳簱" prop="receiveWarehouse">
+ <el-select
+ placeholder="璇烽�夋嫨鏀惰揣浠撳簱"
+ v-model="editConfig.infomation.receiveWarehouse"
+ clearable
+ style="width: calc(100% - 0px)"
+ >
+ <el-option
+ v-for="(ele, index) in receiveWhouseList"
+ :key="index"
+ :label="ele.name"
+ :value="ele.id"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍦板潃" prop="address">
+ <el-input v-model="editConfig.infomation.address" placeholder="璇峰～鍐�" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ユ敹浜�" prop="recipient">
+ <el-input v-model="editConfig.infomation.recipient" placeholder="璇峰～鍐�" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉ユ簮鍗曟嵁" prop="sourceDoc">
+ <el-input v-model="editConfig.infomation.sourceDoc" placeholder="璇峰～鍐�" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -373,6 +405,7 @@
}
},
created() {
+ console.log(this.editConfig,"鍙傛暟")
this.handleGetBomKindDictList()
this.$store.dispatch("getSupplier")
this.formInfo()
@@ -446,13 +479,15 @@
this.plcBrandList = res.data
this.setTableForm()
if (val) {
+ // this.plcBrandList.map((item)=>{
+ // item.purchaseTypeId=item.id
+ // })
for (let i in this.plcBrandList) {
if (this.plcBrandList[i][this.editRow.isDefault]) {
this.editConfig.infomation.purchaseTypeId = this.editConfig.infomation.purchaseTypeId
? this.editConfig.infomation.purchaseTypeId
: this.plcBrandList[i].id
this.$set(this.editConfig.infomation, "purchaseTypeId", this.editConfig.infomation.purchaseTypeId)
-
break
}
}
@@ -723,7 +758,7 @@
this.tableData = [
{
purchaseId: 0,
- productId:Number(this.productId),
+ productId: Number(this.productId),
productIndex: this.productIndex,
amount: 0,
name: "",
--
Gitblit v1.8.0