From caf1f99e718ca2ac07fa64e7a71a6d7fa88b8989 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 20 十二月 2023 17:57:18 +0800
Subject: [PATCH] 报价单列表和对应产品列表的数据调试
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 2c6b0bd..fe511e5 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -252,6 +252,25 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select
+ v-model="editConfig.infomation.projectId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ :disabled="isView"
+ >
+ <el-option
+ v-for="item in projectList"
+ :key="item.projectId"
+ :label="item.projectName"
+ :value="item.projectId"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
<!-- 鏀惰揣淇℃伅 -->
@@ -471,7 +490,7 @@
<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
+import { getAddSalesDetails, getUpdateSalesDetails, getProjectList } 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"
@@ -519,9 +538,10 @@
// subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
- quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }]
+ quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }],
+ deliveryDate: [{ required: true, message: "璇烽�夋嫨浜や粯鏃ユ湡", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -567,12 +587,14 @@
isAddQuatation: true,
// 浜や粯绫诲瀷
deliveryTypeList: getDataByType("deliveryType"),
+ projectList: [],
quotationList: [],
quotationId: this.editCommonConfig.infomation.quotationId,
tableData: [],
selProductData: [],
isView: this.editCommonConfig.title === "鏌ョ湅",
- selectBox: this.editCommonConfig.title !== "鏌ョ湅"
+ selectBox: this.editCommonConfig.title !== "鏌ョ湅",
+ thatMember: {}
}
},
created() {
@@ -586,6 +608,7 @@
if (this.editConfig.title === "缂栬緫") {
this.productTableList.tableData = this.editConfig.infomation.products
}
+ this.getProjectList()
},
watch: {
"editClientManageConfig.visible"(val) {
@@ -611,6 +634,14 @@
getAllData()
.then((res) => {
this.memberOptions = 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.dataProcess()
})
.catch((err) => {
@@ -640,14 +671,13 @@
this.$message.error("璇烽�夋嫨浜у搧")
} else {
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.tableData.map((item) => {
- this.amountTotal += item.total
+ this.selProductData.map((item) => {
+ this.amountTotal += parseFloat(item.total)
})
let config = {
amountTotal: this.amountTotal,
@@ -696,7 +726,8 @@
logisticNumber: data.logisticNumber || "",
quotationId: this.quotationId,
deliverType: data.deliverType || 0,
- status: 1
+ status: 1,
+ projectId: data.projectId || ""
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -806,6 +837,7 @@
},
handleSelectClient(value, item) {
if (value === "client") {
+ this.thatMember = item.member
this.editConfig.infomation.subbill_name = ""
this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
@@ -913,6 +945,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price" },
{ label: "浠风◣鍚堣", prop: "total" }
]
@@ -930,6 +963,23 @@
// 閫夋嫨浜у搧
getSelectArray(val) {
this.selProductData = val
+ },
+ // 鑾峰彇椤圭洰鍒楄〃
+ async getProjectList() {
+ await getProjectList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ this.projectList = res.data
+ })
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0