From 1f4bc9f584c07a0958747657b7353ccbd1d56b41 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 17:39:00 +0800
Subject: [PATCH] bug修复及销售子单产品管理相关
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 158 +++++++++++++++++++++++++++++-----------------------
1 files changed, 87 insertions(+), 71 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index c70c802..462727f 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -50,10 +50,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞�诲崟" prop="masterOrderNumber">
+ <el-form-item label="閿�鍞�诲崟" prop="master_order_number">
<div class="custom-name">
<el-autocomplete
- v-model="editConfig.infomation.masterOrderNumber"
+ v-model="editConfig.infomation.master_order_number"
:fetch-suggestions="
(queryString, callback) => {
querySearchAsync(queryString, callback, 'master')
@@ -87,7 +87,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info-title">闄勪欢淇℃伅</div>
+ <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -112,7 +112,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
@@ -131,7 +131,11 @@
</div>
</div>
<div class="product-view">
- <CommonFormTableView :product-table-list="productTableList" />
+ <CommonFormTableView
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ />
</div>
<!-- 鍚堣 -->
<div class="basic-info-view">
@@ -281,7 +285,10 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- masterId: this.editCommonConfig.infomation.masterOrderId
+ masterId: this.editCommonConfig.infomation.masterOrderId,
+ tableData: [],
+ productId: 1,
+ addProductArr: []
}
},
created() {
@@ -307,7 +314,7 @@
dataProcess() {
this.masterOrderList.map((item) => {
if (this.masterId === item.id) {
- this.editConfig.infomation.masterOrderNumber = item.number
+ this.editConfig.infomation.master_order_number = item.number
}
})
},
@@ -319,37 +326,23 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddSubOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddSubOrder(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- getUpdateSubOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateSubOrder(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -361,21 +354,11 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- clientId: parseInt(this.clientId) || 0,
- masterOrderId: parseInt(this.masterId) || 0,
+ clientId: this.clientId || 0,
+ masterOrderId: this.masterId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- product: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ product: this.tableData
}
return params
},
@@ -421,6 +404,7 @@
} else if (value == "master") {
this.editSelectMasterConfig.title = "閿�鍞�诲崟"
this.editSelectMasterConfig.editVisible = true
+ this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList]
}
},
selClient(row, value) {
@@ -430,7 +414,7 @@
this.editConfig.infomation.client_id = row.id
this.clientId = row.id
} else if (value == "master") {
- this.editConfig.infomation.masterOrderNumber = row.number
+ this.editConfig.infomation.master_order_number = row.number
this.masterId = row.id
}
},
@@ -441,7 +425,7 @@
this.editConfig.infomation.client_id = 0
this.clientId = 0
} else if (value == "master") {
- this.editConfig.infomation.masterOrderNumber = ""
+ this.editConfig.infomation.master_order_number = ""
this.masterId = 0
}
},
@@ -450,32 +434,64 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓") {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "",
- other6: "3.00",
- other7: "2.00"
+ id: 1,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
}
- ],
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ }
+ this.productTableList = {
+ tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "璁￠噺鍗曚綅", prop: "other2" },
- { label: "瑙勬牸缂栧彿", prop: "other3" },
- { label: "婧愬崟绫诲瀷", prop: "other4" },
- { label: "鍚堝悓淇℃伅", prop: "other5" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other6", input: true },
- { label: "浠风◣鍚堣", prop: "other7", input: true },
+ { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "Number" },
+ { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "Unit", input: true },
+ { label: "浠风◣鍚堣", prop: "other3", input: true },
{ label: "鎻忚堪", prop: "other8" }
]
}
+ },
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ console.log("aaaaaaaa")
+ console.log(val, prop)
+ this.productId = row.id
+ this.tableData.map((item) => {
+ if (item.id === row.id) {
+ item[prop] = val
+ }
+ })
+ console.log(this.tableData)
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ id: this.productId,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
+ })
}
}
}
--
Gitblit v1.8.0