From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 200 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 183 insertions(+), 17 deletions(-)
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 83988e3..c35a201 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -34,16 +34,14 @@
<el-input
v-if="
editConfig.title == '缂栬緫' ||
- (editConfig.title == '鏂板缓' &&
- codenumer &&
- (explain != '' || isIdDisabled))
+ (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"
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
<!-- <WordInput
@@ -314,6 +312,32 @@
</el-col>
</el-row>
</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%">
+ <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"
+ :addTypeIdMultiple="true"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
+ </div>
+
<!-- 鍟嗘満涓冭绱� -->
<div class="basic-info-title">鍟嗘満涓冭绱�(5W2P)</div>
<div class="basic-info-view">
@@ -593,6 +617,7 @@
import { getCityList } from "@/api/common/address"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getContactList } from "@/api/client/contacts"
+import CommonFormTableView from "@/components/makepager/CommonFormTableView.vue"
export default {
name: "AddSalesOpportunityDialog",
mixins: [codeMixin],
@@ -608,7 +633,7 @@
}
}
},
- components: { SelectClientDialog, SelectContactDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -623,10 +648,10 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, validator: this.validateCheckCode, trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
name: [{ required: true, message: "璇疯緭鍏ユ満浼氬悕绉�", trigger: "blur" }],
- member_id: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
sale_stage_id: [{ required: true, message: "璇烽�夋嫨閿�鍞樁娈�", trigger: "change" }],
currency: [{ required: true, message: "璇烽�夋嫨甯佺", trigger: "change" }],
expected_time: [{ required: true, message: "璇烽�夋嫨棰勮鎴愪氦鏃ユ湡", trigger: "change" }],
@@ -660,7 +685,16 @@
contactId: this.editCommonConfig.infomation.contact_id,
objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�", codeStandID: "" },
isContact: true,
- contactNamelist: []
+ contactNamelist: [],
+ tableData: [],
+ productTableList: {},
+ showSummary: {
+ show: true,
+ total: true,
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
+ },
+ productId: 1
}
},
created() {
@@ -668,6 +702,7 @@
if (this.editConfig.title !== "鏂板缓" && this.editConfig.infomation.province_id !== 0) {
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
+ this.setTableForm()
this.getCommonData()
this.formInfo()
if (this.editConfig.title === "缂栬緫") {
@@ -680,7 +715,7 @@
if (val) {
this.formInfo()
}
- },
+ }
},
methods: {
formInfo() {
@@ -699,10 +734,22 @@
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, "member_id", item.id)
+ }
+ })
+ }
this.businessSourceOptions = res.data.sales_source
this.businessTypeOptions = res.data.sale_type
this.oldCustomerMarketOptions = res.data.regular_customers
this.saleStageOptions = res.data.sale_stage
+ if (this.editConfig.title === "鏂板缓") {
+ this.editConfig.infomation.sale_stage_id=1
+ }
+
this.provinceOptions = res.data.province
this.regionOptions = res.data.region
this.possibleOptions = res.data.possibility
@@ -724,7 +771,12 @@
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- console.log(this.editConfig.infomation)
+ // const hasProduct = this.tableData.every((ele) => !!ele.name)
+ // if (!hasProduct) {
+ // this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ // return
+ // }
+
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
@@ -733,10 +785,13 @@
this.editConfig.visible = false
if (res.code === 200) {
this.$message.success("娣诲姞鎴愬姛锛�")
- this.$parent.getData()
- // }
- }else{
- this.$message.error(res.msg?res.msg:"娣诲姞澶辫触锛�")
+ if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation?.sourceTitle === "鎺ㄨ繘") {
+ this.$parent.handleClose()
+ } else {
+ this.$parent.getData()
+ }
+ } else {
+ this.$message.error(res.msg ? res.msg : "娣诲姞澶辫触锛�")
}
})
} else {
@@ -745,9 +800,9 @@
this.editConfig.visible = false
if (res.code === 200) {
this.$message.success("缂栬緫鎴愬姛锛�")
- this.$parent.getData()
- }else{
- this.$message.error(res.msg?res.msg:"缂栬緫澶辫触锛�")
+ this.$parent?.getData()
+ } else {
+ this.$message.error(res.msg ? res.msg : "缂栬緫澶辫触锛�")
}
})
}
@@ -759,6 +814,12 @@
},
saveParams() {
let data = this.editConfig.infomation
+ let products = []
+ this.tableData.map((item) => {
+ if (item.number.length > 0) {
+ products.push(item)
+ }
+ })
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
advantages: data.advantages || "",
@@ -796,6 +857,7 @@
detail_address: data.detail_address || "",
codeStandID: data.ID,
+ products: products
}
return params
},
@@ -906,6 +968,110 @@
}
}
})
+ },
+ 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: this.tableData,
+ isReturn: true,
+ tableColumn: [
+ // { 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.number === row.number) {
+ 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
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val, index) {
+ if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ this.tableData = []
+ }
+ if (index < this.tableData.length) {
+ this.tableData.splice(index, 1)
+ val.map((item, ind) => {
+ this.tableData.splice(index + ind, 0, item)
+ })
+ } else {
+ this.tableData = this.tableData.concat(val)
+ }
+ this.productTableList.tableData = this.tableData
+ 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
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.member_id > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0