From b136c0a80500d929897a8e24f920efad47e2e307 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:03:01 +0800
Subject: [PATCH] 变更公海 的接口传参修改
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 21 deletions(-)
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 7f09501..db9ee6d 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -31,7 +31,22 @@
<!-- </el-col>-->
<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"
@@ -42,7 +57,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">
@@ -299,6 +314,30 @@
</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"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
+ </div>
+
<!-- 鍟嗘満涓冭绱� -->
<div class="basic-info-title">鍟嗘満涓冭绱�(5W2P)</div>
<div class="basic-info-view">
@@ -576,9 +615,9 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import { getCityList } from "@/api/common/address"
-import WordInput from "@/components/wordInput.vue"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+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],
@@ -594,7 +633,7 @@
}
}
},
- components: { WordInput, SelectClientDialog, SelectContactDialog },
+ components: {CommonFormTableView, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -609,7 +648,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏ラ攢鍞満浼氱紪鍙�", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }],
name: [{ required: true, message: "璇疯緭鍏ユ満浼氬悕绉�", trigger: "blur" }],
member_id: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
@@ -646,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() {
@@ -654,9 +702,10 @@
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 === '缂栬緫'){
+ if (this.editConfig.title === "缂栬緫") {
this.isContact = false
this.getContactList(this.editConfig.infomation.contact_id)
}
@@ -667,9 +716,6 @@
this.formInfo()
}
},
- "editConfig.infomation.codeStandID"() {
- this.formInfo()
- }
},
methods: {
formInfo() {
@@ -712,9 +758,13 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
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 === "鏂板缓") {
@@ -722,9 +772,11 @@
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
+ this.$message.success("娣诲姞鎴愬姛锛�")
this.$parent.getData()
// }
+ }else{
+ this.$message.error(res.msg?res.msg:"娣诲姞澶辫触锛�")
}
})
} else {
@@ -732,8 +784,10 @@
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
+ this.$message.success("缂栬緫鎴愬姛锛�")
this.$parent.getData()
+ }else{
+ this.$message.error(res.msg?res.msg:"缂栬緫澶辫触锛�")
}
})
}
@@ -778,22 +832,22 @@
status_id: data.status_id || 0,
threats: data.threats || "",
whether_established: data.whether_established || "",
-
remark: data.remark || "",
detail_address: data.detail_address || "",
codeStandID: data.ID,
- codeRule: this.codeRule
+ products: this.tableData,
}
return params
},
// 鑾峰彇鑱旂郴浜哄垪琛�
getContactList(id) {
getContactList({
- clientId: id,
page: 0,
pageSize: 0,
- search_map: {}
+ search_map: {
+ client_id: id
+ }
}).then((res) => {
if (res.code == 200) {
this.contactNamelist = res.data.list
@@ -820,7 +874,7 @@
if (value === "client") {
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
- this.editConfig.infomation.contact_name = ''
+ this.editConfig.infomation.contact_name = ""
this.contactId = 0
this.isContact = false
this.getContactList(item.id)
@@ -835,6 +889,7 @@
this.editSelectClientConfig.editVisible = true
} else if (value === "contact") {
this.editSelectContactConfig.editVisible = true
+ this.editSelectContactConfig.clientId = this.clientId
}
},
selClient(row, value) {
@@ -844,7 +899,7 @@
} else if (value === "client") {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
- this.editConfig.infomation.contact_name = ''
+ this.editConfig.infomation.contact_name = ""
this.contactId = 0
this.isContact = false
this.getContactList(row.id)
@@ -892,6 +947,85 @@
}
}
})
+ },
+ 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,
+ 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.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
}
}
}
--
Gitblit v1.8.0