From 23d80c1b64f23ede237ab8e89ebc2ee2aaf43f26 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 19 七月 2023 19:32:10 +0800
Subject: [PATCH] 销售模块接口联调
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 243 +++++++++++++++++++++++++++++++-----------------
1 files changed, 156 insertions(+), 87 deletions(-)
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 906bc9e..0e780e3 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -22,23 +22,23 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="customName">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.customName"></el-input>
+ <el-input v-model="editConfig.infomation.clientId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
- <el-input v-model="editConfig.infomation.orderNumber"></el-input>
+ <el-form-item label="璁㈠崟缂栧彿" prop="number">
+ <el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="salesOpportunity">
+ <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.salesOpportunity"></el-input>
+ <el-input v-model="editConfig.infomation.saleChanceId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
@@ -58,25 +58,20 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绛剧害鏃ユ湡" prop="signDate">
- <el-date-picker v-model="editConfig.infomation.signDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-form-item label="绛剧害鏃ユ湡" prop="signTime">
+ <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞礋璐ｄ汉" prop="salesHead">
+ <el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
- v-model="editConfig.infomation.salesHead"
+ v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 63%"
>
- <el-option
- v-for="item in salesHeadOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-option v-for="item in memberOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -89,10 +84,25 @@
</el-col>
<el-col :span="12">
<el-form-item label="寰俊璁㈠崟鐘舵��" prop="wechatOrderStatus">
- <CommonSelectView
- :common-value="editConfig.infomation.wechatOrderStatus"
- :common-options="wechatOrderStatusOptions"
- />
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.wechatOrderStatus"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option
+ v-for="item in wechatOrderStatusOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ <div class="common-select-btn">
+ <i class="el-icon-setting"></i>
+ </div>
+ </div>
</el-form-item>
</el-col>
</el-row>
@@ -102,21 +112,21 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鏀惰揣浜�" prop="consignee">
- <el-input v-model="editConfig.infomation.consignee"></el-input>
+ <el-form-item label="鏀惰揣浜�" prop="addressee">
+ <el-input v-model="editConfig.infomation.addressee"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="consigneeContactInfo">
- <el-input v-model="editConfig.infomation.consigneeContactInfo"></el-input>
+ <el-form-item label="鏀惰揣浜鸿仈绯绘柟寮�" prop="phone">
+ <el-input v-model="editConfig.infomation.phone"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-form-item label="鏀惰揣鍦板潃" prop="address">
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.shippingAddress"
+ v-model="editConfig.infomation.address"
></el-input>
</el-form-item>
</el-col>
@@ -180,7 +190,13 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <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-option>
</el-select>
@@ -190,7 +206,7 @@
<CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
+ <!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
<div v-if="editConfig.title === '鏂板缓'" class="basic-info-view">
<el-row>
<el-col :span="20">
@@ -232,12 +248,12 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button>
+ <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
<el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
@@ -246,8 +262,9 @@
</template>
<script>
-import CommonSelectView from "@/components/makepager/CommonSelectView"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import { getAllData } from "@/api/client/client"
+import { getAddSalesDetails, getUpdateSalesDetails } from "@/api/sales/salesDetails"
export default {
name: "AddSalesDetailsDialog",
props: {
@@ -257,54 +274,26 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- customName: "",
- orderNumber: "XSHT521",
- salesOpportunity: "",
- selSourceOrder: "",
- signDate: "",
- salesHead: "",
- deliveryDate: "",
- wechatOrderStatus: "",
- consignee: "",
- consigneeContactInfo: "",
- shippingAddress: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalUrgent: "",
- approvalOpinion: ""
- }
+ infomation: {}
}
}
}
},
- components: { CommonSelectView, CommonFormTableView },
+ components: { CommonFormTableView },
computed: {},
data() {
return {
dialogWidth: "80%",
editConfig: this.editCommonConfig,
rules: {
- customName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- orderNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- signDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- salesHead: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
- approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
+ clientId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ // approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
- salesHeadOptions: [
- // 閿�鍞礋璐ｄ汉
- { value: "1", label: "BOSS" },
- { value: "2", label: "Mia" },
- { value: "3", label: "璐㈠姟" },
- { value: "4", label: "甯傚満" },
- { value: "5", label: "绯荤粺绠＄悊鍛�" },
- { value: "6", label: "閿�鍞�" },
- { value: "7", label: "閿�鍞�荤洃" }
- ],
- selSourceOrderOptions: [{ value: "1", label: "閿�鍞瓙鍗�" }],
+ memberOptions: [],
+ selSourceOrderOptions: [],
wechatOrderStatusOptions: [], // 寰俊璁㈠崟鐘舵��
currencyOptions: [
{ value: "1", label: "浜烘皯甯�(楼)" },
@@ -323,21 +312,108 @@
},
created() {
this.setTableForm()
+ this.getCommonData()
},
methods: {
+ getCommonData() {
+ getAllData()
+ .then((res) => {
+ this.memberOptions = res.data.member
+ })
+ .catch((err) => {
+ console.log(err)
+ })
+ },
+ // 淇濆瓨
+ saveClick(formName) {
+ 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)
+ })
+ } else {
+ getUpdateSalesDetails(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)
+ })
+ }
+ } else {
+ console.log("error submit")
+ return false
+ }
+ })
+ },
+ saveParams() {
+ let data = this.editConfig.infomation
+ let params = {
+ id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
+ salesDetails: {
+ address: data.address || "",
+ addressee: data.addressee || "",
+ clientId: data.id || 0,
+ conditions: data.conditions || "",
+ deliveryDate: data.id || "",
+ memberId: data.id || 0,
+ number: data.deliveryDate || "",
+ phone: data.phone || "",
+ products: [
+ {
+ amount: 0,
+ desc: "",
+ id: 0,
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ],
+ remark: data.remark || "",
+ saleChanceId: data.id || 0,
+ saleType: data.id || 0,
+ signTime: data.signTime || "",
+ wechatOrderStatus: data.id || 0
+ }
+ }
+ return params
+ },
+
+ handleClose() {
+ this.editConfig.visible = false
+ },
+ // 娣诲姞闄勪欢
+ addAnnexClick() {},
+ // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
+ setFormatClick() {},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "",
- other6: "3.00",
- other7: "2.00"
- }
- ],
+ tableData: [],
tableColumn: [
{ label: "#", prop: "id", width: 40 },
{ label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
@@ -350,14 +426,7 @@
{ label: "婧愬崟", prop: "other3" }
]
}
- },
- handleClose() {
- this.editConfig.visible = false
- },
- // 娣诲姞闄勪欢
- addAnnexClick() {},
- // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
- setFormatClick() {}
+ }
}
}
</script>
--
Gitblit v1.8.0