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/refundForm/AddRefundFormDialog.vue | 251 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 174 insertions(+), 77 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index adfcbc7..f600c21 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -22,17 +22,17 @@
<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="refundOrderNo">
- <el-input v-model="editConfig.infomation.refundOrderNo"></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">
@@ -49,19 +49,14 @@
</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>
@@ -73,38 +68,65 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡" prop="paymentMethod">
- <CommonSelectView
- :common-value="editConfig.infomation.paymentMethod"
- :common-options="paymentMethodOptions"
- />
+ <el-form-item label="浠樻鏂瑰紡" prop="refundMethod">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.refundMethod"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in refundMethodOptions" :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-col :span="12">
- <el-form-item label="璐︽埛" prop="account">
- <CommonSelectView :common-value="editConfig.infomation.account" :common-options="accountOptions" />
+ <el-form-item label="璐︽埛" prop="accountId">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.accountId"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in accountOptions" :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-col :span="12">
- <el-form-item label="鏄惁寮�绁�" prop="whetherInvoicing">
- <CommonSelectView
- :common-value="editConfig.infomation.whetherInvoicing"
- :common-options="whetherInvoicingOptions"
- />
+ <el-form-item label="鏄惁寮�绁�" prop="isInvoice">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.isInvoice"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in isInvoiceOptions" :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>
</div>
- <!-- 澶囨敞淇℃伅 -->
- <div class="basic-info-title">澶囨敞淇℃伅</div>
- <div class="address-view">
+ <!-- 閫�娆惧師鍥� -->
+ <div class="basic-info-title">閫�娆惧師鍥�</div>
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="閫�娆惧師鍥�" prop="refundReason">
+ <el-form-item label="閫�娆惧師鍥�" prop="reason">
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.refundReason"
+ v-model="editConfig.infomation.reason"
></el-input>
</el-form-item>
</el-col>
@@ -142,7 +164,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>
@@ -152,7 +180,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">
@@ -189,11 +217,11 @@
</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>
@@ -202,8 +230,9 @@
</template>
<script>
-import CommonSelectView from "@/components/makepager/CommonSelectView"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import { getAllData } from "@/api/client/client"
+import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
export default {
name: "AddRefundFormDialog",
props: {
@@ -213,50 +242,27 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- customName: "",
- refundOrderNo: "TKD20230521-12",
- selSourceOrder: "",
- salesHead: "",
- refundDate: "",
- paymentMethod: "",
- account: "",
- whetherInvoicing: "",
- refundReason: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
- }
+ infomation: {}
}
}
}
},
- components: { CommonSelectView, CommonFormTableView },
+ components: { CommonFormTableView },
computed: {},
data() {
return {
dialogWidth: "80%",
editConfig: this.editCommonConfig,
rules: {
- customName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- refundOrderNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ clientId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
refundDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- salesHead: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
account: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
- salesHeadOptions: [
- // 閿�鍞礋璐ｄ汉
- { value: "1", label: "BOSS" },
- { value: "2", label: "Mia" },
- { value: "3", label: "璐㈠姟" },
- { value: "4", label: "甯傚満" },
- { value: "5", label: "绯荤粺绠＄悊鍛�" },
- { value: "6", label: "閿�鍞�" },
- { value: "7", label: "閿�鍞�荤洃" }
- ],
+ memberOptions: [],
selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
- paymentMethodOptions: [
+ refundMethodOptions: [
{ value: "1", label: "鐜伴噾" },
{ value: "2", label: "鏀エ" },
{ value: "3", label: "鐢垫眹" },
@@ -265,7 +271,7 @@
{ value: "6", label: "鍏朵粬" }
], // 浠樻鏂瑰紡
accountOptions: [{ value: "1", label: "浜烘皯甯佽处鎴�" }], // 璐︽埛
- whetherInvoicingOptions: [
+ isInvoiceOptions: [
{ value: "1", label: "鏈紑" },
{ value: "2", label: "宸插紑" }
], // 鏄惁寮�绁�
@@ -286,8 +292,99 @@
},
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 === "鏂板缓") {
+ getAddSalesRefund(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 {
+ getUpdateSalesRefund(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,
+ salesRefund: {
+ accountId: data.accountId || 0,
+ clientId: data.clientId || 0,
+ isInvoice: data.isInvoice || 0,
+ memberId: data.memberId || 0,
+ number: data.number || "",
+ products: [
+ {
+ amount: 0,
+ desc: "",
+ id: 0,
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ],
+ reason: data.reason || "",
+ refundDate: data.refundDate || "",
+ refundMethod: data.refundMethod || ""
+ }
+ }
+ return params
+ },
+ handleClose() {
+ this.editConfig.visible = false
+ },
+ // 娣诲姞闄勪欢
+ addAnnexClick() {},
+ // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
+ setFormatClick() {},
setTableForm() {
this.productTableList = {
tableData: [
@@ -319,14 +416,7 @@
{ label: "鎻忚堪", prop: "other8" }
]
}
- },
- handleClose() {
- this.editConfig.visible = false
- },
- // 娣诲姞闄勪欢
- addAnnexClick() {},
- // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
- setFormatClick() {}
+ }
}
}
</script>
@@ -354,10 +444,17 @@
font-size: 18px;
}
}
- }
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
}
.annex-view {
display: flex;
--
Gitblit v1.8.0