From 60d0884f82141a0127fca7e2b03bf3c147436776 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 08 三月 2024 11:29:20 +0800
Subject: [PATCH] 采购订单列表接口联调和添加采购订单接口联调
---
src/views/purchaseManage/purchase/components/AddPurchase.vue | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index 541e76c..10641ed 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,54 @@
value-format="yyyy-MM-dd"
>
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏀惰揣浠撳簱" prop="warehouse">
+ <el-select
+ placeholder="璇烽�夋嫨鏀惰揣浠撳簱"
+ v-model="editConfig.infomation.warehouse"
+ clearable
+ style="width: calc(100% - 0px)"
+ :disabled="editConfig.isDisabled"
+ >
+ <el-option
+ v-for="(ele, index) in receiveWhouseList"
+ :key="index"
+ :label="ele.name"
+ :value="ele.name"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍦板潃" prop="warehouseAddress">
+ <el-input
+ :disabled="editConfig.isDisabled"
+ v-model="editConfig.infomation.warehouseAddress"
+ placeholder="璇峰～鍐�"
+ clearable
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ユ敹浜�" prop="principal">
+ <el-input
+ :disabled="editConfig.isDisabled"
+ v-model="editConfig.infomation.principal"
+ placeholder="璇峰～鍐�"
+ clearable
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉ユ簮鍗曟嵁" prop="sourceOrder">
+ <el-input
+ :disabled="editConfig.isDisabled"
+ v-model="editConfig.infomation.sourceOrder"
+ placeholder="璇峰～鍐�"
+ clearable
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -287,7 +335,13 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import BomDialog from "@/components/makepager/BomDialog"
import { getProductList } from "@/api/productManage/product"
-import { addPurchase, updatePurchase, savePurchaseType, getPurchaseType } from "@/api/purchaseManage/purchase"
+import {
+ addPurchase,
+ updatePurchase,
+ savePurchaseType,
+ getPurchaseType,
+ getWarehouseInfo
+} from "@/api/purchaseManage/purchase"
import SelectSupplierDialog from "@/views/purchaseManage/purchase/components/SelectSupplierDialog"
// import { formToJSON } from "axios";
import codeMixin from "@/components/mixin/codeMixin"
@@ -369,11 +423,14 @@
total: 0,
totalTwo: 0,
productListIdx: 0,
- lacks: []
+ lacks: [],
+ receiveWhouseList: [] // 鏀惰揣浠撳簱鍒楄〃
}
},
created() {
+ console.log(this.editConfig, "鍙傛暟")
this.handleGetBomKindDictList()
+ this.getWarehouseInfo()
this.$store.dispatch("getSupplier")
this.formInfo()
},
@@ -446,13 +503,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
}
}
@@ -648,11 +707,15 @@
realTotalPrice: this.total ? Number(this.total) : 0,
totalPrice: this.totalTwo ? Number(this.totalTwo) : 0,
status: data.status,
- quantity: data.quantity // 閲囪喘鏁伴噺
+ quantity: data.quantity, // 閲囪喘鏁伴噺
+ warehouse: data.warehouse || "", // 鏀惰揣浠撳簱
+ warehouseAddress: data.warehouseAddress || "", // 鏀惰揣浠撳簱鍦板潃
+ principal: data.principal || "", // 浠撳簱璐熻矗浜�
+ sourceOrder: data.sourceOrder || "" // 鏉ユ簮鍗曟嵁
}
}
- if (data.ID) {
- params.purchase.id = data.ID
+ if (data.id) {
+ params.purchase.id = data.id
}
return params
},
@@ -676,13 +739,13 @@
},
// 閫夋嫨渚涘簲鍟�
async handleSelectClient(value, item) {
- this.productTableList.supplierId = item.ID
+ this.productTableList.supplierId = item.id
if (value === "client") {
this.supplierId = item.id
- this.editConfig.infomation.supplierId = item.ID
+ this.editConfig.infomation.supplierId = item.id
}
await getProductList({
- supplierId: item.ID,
+ supplierId: item.id,
page: 1,
pageSize: 100
}).then((res) => {
@@ -697,7 +760,7 @@
},
async selClient(row) {
await getProductList({
- supplierId: row.ID,
+ supplierId: row.id,
page: 1,
pageSize: 100
}).then((res) => {
@@ -708,7 +771,7 @@
this.$set(this.editConfig.infomation, "supplierName", row.name)
this.editConfig.infomation.contact = row.contact
this.editConfig.infomation.phone = row.phone
- this.editConfig.infomation.supplierId = row.ID
+ this.editConfig.infomation.supplierId = row.id
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
@@ -719,11 +782,11 @@
}
},
setTableForm() {
- if (!this.editConfig.infomation.ID || this.editConfig.infomation.productList.length === 0) {
+ if (!this.editConfig.infomation.id || this.editConfig.infomation.productList.length === 0) {
this.tableData = [
{
purchaseId: 0,
- productId: this.productId,
+ productId: Number(this.productId),
productIndex: this.productIndex,
amount: 0,
name: "",
@@ -860,8 +923,15 @@
},
//閫変腑浜у搧
handleProduct(item) {
- this.tableData[this.productListIdx].productId = item.ID
+ this.tableData[this.productListIdx].productId = Number(item.id)
console.log(item, "閫変腑浜у搧", this.tableData)
+ },
+ // 鑾峰彇鏀惰揣浠撳簱鍒楄〃
+ async getWarehouseInfo() {
+ await getWarehouseInfo().then((res) => {
+ console.log(res)
+ this.receiveWhouseList = res.data.info
+ })
}
}
}
--
Gitblit v1.8.0