From f417dc0a44d225d4ed19bcb5207250eb1b669455 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 25 八月 2023 12:45:09 +0800
Subject: [PATCH] bug修复
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 384 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 247 insertions(+), 137 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index d65d667..91a283a 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.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"
@@ -37,7 +39,11 @@
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('client')">
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
<i class="el-icon-edit-outline" title="娓呴櫎"></i>
</div>
</div>
@@ -64,7 +70,11 @@
<div class="common-select-btn" @click="selClientClick('chance')">
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('chance')">
+ <div
+ v-if="editConfig.infomation.sale_chance_name && editConfig.infomation.sale_chance_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('chance')"
+ >
<i class="el-icon-edit-outline"></i>
</div>
</div>
@@ -85,7 +95,12 @@
</el-col> -->
<el-col :span="12">
<el-form-item label="绛剧害鏃ユ湡" prop="signTime">
- <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.signTime"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -104,7 +119,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="浜や粯鏃ユ湡" prop="deliveryDate">
- <el-date-picker v-model="editConfig.infomation.deliveryDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.deliveryDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -168,7 +188,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦璐圭敤" prop="logisticCost">
- <el-input v-model="editConfig.infomation.logisticCost"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.logisticCost"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -178,11 +205,11 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="鏉℃涓庢潯浠�" prop="termsTreaty">
+ <el-form-item label="鏉℃涓庢潯浠�" prop="conditions">
<el-input
type="textarea"
:autosize="{ minRows: 4 }"
- v-model="editConfig.infomation.termsTreaty"
+ v-model="editConfig.infomation.conditions"
></el-input>
</el-form-item>
</el-col>
@@ -193,14 +220,18 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞" prop="notes">
- <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.notes"></el-input>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ type="textarea"
+ :autosize="{ minRows: 2 }"
+ v-model="editConfig.infomation.remark"
+ ></el-input>
</el-form-item>
</el-col>
</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">
@@ -225,26 +256,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 :show-summary="showSummary" :product-table-list="productTableList" />
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -310,6 +343,8 @@
:edit-common-config="editSelectChanceConfig"
@selClient="selClient"
/>
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</el-dialog>
</div>
</template>
@@ -320,6 +355,7 @@
import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
+import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
export default {
name: "AddSalesDetailsDialog",
props: {
@@ -334,7 +370,7 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectChanceDialog, AddCollectionPlan },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -357,17 +393,13 @@
memberOptions: [],
selSourceOrderOptions: [],
wechatOrderStatusOptions: [], // 寰俊璁㈠崟鐘舵��
- currencyOptions: [
- { value: "1", label: "浜烘皯甯�(楼)" },
- { value: "2", label: "鑻遍晳(拢)" },
- { value: "3", label: "娆у厓(鈧�)" }
- ], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other7"],
+ sumProp: ["Amount", "total"],
mergeNumber: 2
},
editSelectClientConfig: {
@@ -380,8 +412,16 @@
title: "",
infomation: {}
},
- clientId: this.editCommonConfig.infomation.clientId,
- saleChanceId: this.editCommonConfig.infomation.saleChanceId
+ clientId: this.editCommonConfig.infomation.client_id,
+ saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ productId: 1,
+ isNoProduct: true,
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ amountTotal: 0
}
},
created() {
@@ -413,40 +453,44 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesDetails(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 {
- getUpdateSalesDetails(params)
- .then((res) => {
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
+ this.tableData.map((item) => {
+ this.amountTotal += item.total
})
+ let config = {
+ amountTotal: this.amountTotal,
+ id: res.data.id
+ }
+ this.$emit("addCollectionPlanClick", config)
+ }
+ })
+ } else {
+ getUpdateSalesDetails(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
this.$parent.getData()
}
})
- .catch((err) => {
- console.log(err)
- })
+ }
}
} else {
console.log("error submit")
@@ -456,36 +500,34 @@
},
saveParams() {
let data = this.editConfig.infomation
- let params = {
- id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- salesDetails: {
- address: data.address || "",
- addressee: data.addressee || "",
- clientId: parseInt(this.clientId),
- conditions: data.conditions || "",
- deliveryDate: data.deliveryDate || "",
- memberId: data.memberId || 0,
- number: data.number || "",
- phone: data.phone || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
- remark: data.remark || "",
- saleChanceId: parseInt(this.saleChanceId),
- saleType: data.saleType || 0,
- signTime: data.signTime || "",
- wechatOrderStatus: data.wechatOrderStatus || 0,
- logisticCompany: data.logisticCompany || "",
- logisticCost: parseInt(data.logisticCost) || 0,
- logisticNumber: data.logisticNumber || ""
+ let commonParam = {
+ address: data.address || "",
+ addressee: data.addressee || "",
+ clientId: this.clientId || 0,
+ conditions: data.conditions || "",
+ deliveryDate: data.deliveryDate || "",
+ memberId: data.memberId || 0,
+ number: data.number || "",
+ phone: data.phone || "",
+ products: this.tableData,
+ remark: data.remark || "",
+ saleChanceId: this.saleChanceId || 0,
+ saleType: data.saleType || 0,
+ signTime: data.signTime || "",
+ wechatOrderStatus: data.wechatOrderStatus || 0,
+ logisticCompany: data.logisticCompany || "",
+ logisticCost: data.logisticCost || 0,
+ logisticNumber: data.logisticNumber || ""
+ }
+ let params = {}
+ if (this.editConfig.title === "鏂板缓") {
+ params = { ...commonParam }
+ } else {
+ params = {
+ id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+ salesDetails: {
+ ...commonParam
+ }
}
}
return params
@@ -525,9 +567,9 @@
}
},
selClient(row, value) {
- if (value === "contact") {
- this.editConfig.infomation.contact_name = row.name
- this.contactId = row.id
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -548,20 +590,83 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = [
+ {
+ 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: [],
+ tableData: this.tableData,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other6", input: true },
- { label: "浠风◣鍚堣", prop: "other7", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other2" },
- { label: "婧愬崟", prop: "other3" }
+ { 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
}
}
}
@@ -569,52 +674,57 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-sales-details {
- .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,
- .common-select {
+::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,
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
+ }
+ .annex-view {
display: flex;
- .common-select-sel {
- width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .annex-view {
+ .unflod-collapse {
display: flex;
+ height: 30px;
+ justify-content: center;
+ align-items: center;
color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
}
- }
- .unflod-collapse {
- display: flex;
- height: 30px;
- justify-content: center;
- align-items: center;
- color: #6166d3;
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
+ }
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
--
Gitblit v1.8.0