From d4f4c52402b91cb8e17c1845da71c5e39662fde0 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 15:28:06 +0800
Subject: [PATCH] 销售报价单列表页增加统计内容及接口联调、添加报价单天天客户名称及对应限制功能
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 88 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 25 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 38ac025..2d116cb 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -25,7 +25,20 @@
<el-row>
<el-col :span="12">
<el-form-item label="閫�娆惧崟缂栧彿" prop="number">
- <WordInput
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
@@ -36,7 +49,7 @@
<span v-else-if="method == 0" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -312,8 +325,8 @@
import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import { getPaymentTypeList } from "@/api/common/payment"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getBankAccountList, getPaymentTypeList } from "@/api/common/payment"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSalesReturnList } from "@/api/sales/salesReturn"
import { mapActions } from "vuex"
@@ -347,9 +360,9 @@
editConfig: this.editCommonConfig,
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
- number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }]
},
memberOptions: [],
@@ -396,9 +409,6 @@
if (val) {
this.formInfo()
}
- },
- "editClientManageConfig.infomation.codeStandID"() {
- this.formInfo()
}
},
methods: {
@@ -410,26 +420,44 @@
this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
this.getRCodeStandardList()
+ this.getBankAccountList()
},
- getCommonData() {
- getAllData().then((res) => {
- this.memberOptions = res.data.member
- this.accountOptions = res.data.accountId
- })
+ async getCommonData() {
+ const res = await getAllData()
+ if (res.code == 200) {
+ this.memberOptions = res.data.member ? res.data.member : []
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "memberId", item.id)
+ }
+ })
+ }
+ }
+ this.$set(this.editConfig.infomation, "memberId", this.editConfig.infomation.memberId)
this.getPaymentTypeList()
},
- async getPaymentTypeList() {
- await getPaymentTypeList().then((res) => {
- if (res.data.code === 200) {
- this.paymentTypeListOptions = res.data.data.data
+ getPaymentTypeList() {
+ getPaymentTypeList().then((res) => {
+ if (res.code === 200) {
+ this.paymentTypeListOptions = res.data.data ?? []
}
+ this.$set(this.editConfig.infomation, "paymentTypeId", this.editConfig.infomation.paymentTypeId)
+ })
+ },
+ getBankAccountList() {
+ getBankAccountList().then((res) => {
+ if (res.code === 200) {
+ this.accountOptions = res.data.data ? res.data.data : []
+ }
+ this.$set(this.editConfig.infomation, "bankAccountId", this.editConfig.infomation.bankAccountId)
})
},
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].name.length === 0) {
this.isNoProduct = true
@@ -442,7 +470,6 @@
this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddSalesRefund(params).then((res) => {
console.log(res)
@@ -484,8 +511,7 @@
reason: data.reason || "",
refundDate: data.refundDate || "",
sourceId: this.sourceId || 0,
- sourceType: 1,
- codeRule: this.codeRule
+ sourceType: 1
}
}
return params
@@ -575,7 +601,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
} else {
@@ -592,6 +619,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -617,7 +645,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
})
this.showSummary.show = true
},
@@ -633,7 +662,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
this.productTableList.tableData = this.tableData
@@ -643,6 +673,14 @@
clearupProduct(data) {
this.tableData = data
this.productTableList.tableData = this.tableData
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0