From bd42b949807795c581e9193d92834a6187fc10d2 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 18:42:59 +0800
Subject: [PATCH] 销售管理模块联调
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 99 ++++++++++++++++++++-----------------------------
1 files changed, 40 insertions(+), 59 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 082208a..2d4e02b 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -74,15 +74,20 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
- <el-date-picker v-model="editConfig.infomation.refundDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.refundDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡" prop="refundMethod">
+ <el-form-item label="浠樻鏂瑰紡" prop="paymentTypeId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.refundMethod"
+ v-model="editConfig.infomation.paymentTypeId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -90,7 +95,7 @@
<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 class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -106,7 +111,7 @@
<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 class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -119,10 +124,9 @@
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-option v-for="item in isInvoiceOptions" :key="item" :label="item" :value="item"> </el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -144,7 +148,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info-title">闄勪欢淇℃伅</div>
+ <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -169,7 +173,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
@@ -286,7 +290,7 @@
// selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
refundMethodOptions: [], // 浠樻鏂瑰紡
accountOptions: [], // 璐︽埛
- isInvoiceOptions: [], // 鏄惁寮�绁�
+ isInvoiceOptions: ["鏄�", "鍚�"], // 鏄惁寮�绁�
currencyOptions: [], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
@@ -300,7 +304,8 @@
editVisible: false,
title: "",
infomation: {}
- }
+ },
+ clientId: this.editCommonConfig.infomation.client_id
}
},
created() {
@@ -315,7 +320,7 @@
this.memberOptions = res.data.member
this.refundMethodOptions = res.data.refundMethod
this.accountOptions = res.data.accountId
- this.isInvoiceOptions = res.data.isInvoice
+ // this.isInvoiceOptions = res.data.isInvoice
this.currencyOptions = res.data.currency
})
.catch((err) => {
@@ -330,37 +335,23 @@
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)
- })
+ getAddSalesRefund(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} 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)
- })
+ getUpdateSalesRefund(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -374,21 +365,11 @@
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
salesRefund: {
accountId: data.accountId || 0,
- clientId: parseInt(data.clientId) || 0,
- isInvoice: data.isInvoice || 0,
+ clientId: this.clientId || 0,
+ isInvoice: data.isInvoice || "",
memberId: data.memberId || 0,
number: data.number || "",
- products: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: data.products || [],
reason: data.reason || "",
refundDate: data.refundDate || "",
refundMethod: data.refundMethod || ""
@@ -411,7 +392,7 @@
}
},
handleSelectClient(item) {
- this.editConfig.infomation.client_id = item.id
+ this.clientId = item.id
},
selClientClick() {
this.editSelectClientConfig.editVisible = true
@@ -419,12 +400,12 @@
selClient(row) {
console.log(row)
this.editConfig.infomation.client_name = row.name
- this.editConfig.infomation.client_id = row.id
+ this.clientId = row.id
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient() {
this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.client_id = 0
+ this.clientId = 0
},
// 娣诲姞闄勪欢
addAnnexClick() {},
--
Gitblit v1.8.0