From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 342 +++++++++++++++++++++++++++-----------------------------
1 files changed, 164 insertions(+), 178 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index f6224c9..7f89c86 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -5,6 +5,8 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ append-to-body
+ custom-class="iframe-dialog"
>
<el-form
ref="form"
@@ -48,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')
@@ -85,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">
@@ -110,84 +112,28 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select
- v-model="editConfig.infomation.currency"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- disabled
- >
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</div>
<div class="product-view">
- <CommonFormTableView :product-table-list="productTableList" />
- </div>
- <!-- 鍚堣 -->
- <div class="basic-info-view">
- <el-row>
- <el-col :span="7" :offset="17">
- <el-form-item prop="discount">
- <template slot="label">
- <span>鏁村崟鎶樻墸</span>
- <el-select
- v-model="discount"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 104px; margin-left: 3px"
- disabled
- >
- <el-option
- v-for="item in discountOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </template>
- <el-input v-model="editConfig.infomation.discount" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="7" :offset="17">
- <el-form-item prop="discount">
- <template slot="label">
- <span>璋冩暣</span>
- <el-select
- v-model="adjust"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 74px; margin-left: 3px"
- disabled
- >
- <el-option
- v-for="item in adjustOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </template>
- <el-input v-model="editConfig.infomation.discount" disabled></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="7" :offset="17">
- <el-form-item label="鍚堣" prop="total">
- <el-button type="text" v-model="editConfig.infomation.total" style="color: #555; font-size: 13px">{{
- editConfig.infomation.total ? editConfig.infomation.total : "0.00"
- }}</el-button>
- </el-form-item>
- </el-col>
- </el-row>
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
</div>
</div>
</el-form>
@@ -251,7 +197,7 @@
},
memberOptions: [],
discount: "2",
- currencyOptions: [],
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
discountOptions: [
{ value: "1", label: "鐧惧垎姣旈檷浠�" },
{ value: "2", label: "鐩存帴闄嶄环" }
@@ -264,9 +210,9 @@
productTableList: {},
showSummary: {
show: true,
- total: false,
- sumProp: ["other1", "other7"],
- mergeNumber: 7
+ total: true,
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -279,7 +225,10 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- masterId: this.editCommonConfig.infomation.masterOrderId
+ masterId: this.editCommonConfig.infomation.masterOrderId,
+ tableData: [],
+ productId: 1,
+ addProductArr: []
}
},
created() {
@@ -305,7 +254,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
}
})
},
@@ -314,40 +263,38 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- 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)
- })
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
+ }
+ if (this.isNoProduct) {
+ this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
- getUpdateSubOrder(params)
- .then((res) => {
+ 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.$message.success("娣诲姞鎴愬姛")
this.$parent.getData()
}
})
- .catch((err) => {
- console.log(err)
+ } else {
+ 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")
@@ -359,21 +306,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
},
@@ -388,11 +325,6 @@
} else if (value === "master") {
restaurants = this.masterOrderList
}
- // else if (value === "chance") {
- // restaurants = this.saleChancelist
- // } else {
- // restaurants = this.saleLeadlist
- // }
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
@@ -419,6 +351,7 @@
} else if (value == "master") {
this.editSelectMasterConfig.title = "閿�鍞�诲崟"
this.editSelectMasterConfig.editVisible = true
+ this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList]
}
},
selClient(row, value) {
@@ -428,7 +361,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
}
},
@@ -439,7 +372,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
}
},
@@ -448,32 +381,83 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "",
- other6: "3.00",
- other7: "2.00"
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
- ],
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ }
+ 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: "other8" }
+ { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
+ },
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ this.productId = row.productId
+ this.tableData.map((item) => {
+ if (item.productId === row.productId) {
+ item[prop] = val
+ }
+ })
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
+ this.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
}
}
}
@@ -481,45 +465,47 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-quotation {
- .basic-info {
- .basic-info-title {
- background-color: #f4f8fe;
- padding-left: 10px;
- font-size: 15px;
- font-weight: bold;
- color: #666;
- height: 42px;
- line-height: 42px;
- }
- .basic-info-view {
- margin-top: 10px;
- padding-right: 40px;
- .custom-name {
+::v-deep {
+ .iframe-dialog .el-dialog__body {
+ .basic-info {
+ .basic-info-title {
+ background-color: #f4f8fe;
+ padding-left: 10px;
+ font-size: 15px;
+ font-weight: bold;
+ color: #666;
+ height: 42px;
+ line-height: 42px;
+ }
+ .basic-info-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ .custom-name {
+ display: flex;
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 18px;
+ cursor: pointer;
+ }
+ }
+ }
+ .address-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ }
+ .annex-view {
display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
- cursor: pointer;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
}
- .annex-view {
- display: flex;
- color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
- }
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
}
}
</style>
--
Gitblit v1.8.0