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/salesReturn/AddSalesReturnDialog.vue | 213 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 142 insertions(+), 71 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index d362302..44c5b3c 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.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="salesReturnOrderNo">
- <el-input v-model="editConfig.infomation.salesReturnOrderNo"></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,10 +49,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閫�鍏ヤ粨搴�" prop="returnWarehouse">
- <el-select v-model="editConfig.infomation.returnWarehouse" size="mini" style="width: 63%">
+ <el-form-item label="閫�鍏ヤ粨搴�" prop="repository">
+ <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%">
<el-option
- v-for="item in returnWarehouseOptions"
+ v-for="item in repositoryOptions"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -62,19 +62,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>
@@ -92,22 +87,35 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <CommonSelectView :common-value="editConfig.infomation.state" :common-options="stateOptions" />
+ <el-form-item label="鐘舵��" prop="status">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.status"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ <div class="common-select-btn" @click="editDropdownBox">
+ <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-view">
<el-row>
<el-col :span="24">
- <el-form-item label="閫�璐у師鍥�" prop="returnReason">
+ <el-form-item label="閫�璐у師鍥�" prop="reason">
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.returnReason"
+ v-model="editConfig.infomation.reason"
></el-input>
</el-form-item>
</el-col>
@@ -165,8 +173,9 @@
</template>
<script>
-import CommonSelectView from "@/components/makepager/CommonSelectView"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import { getAllData } from "@/api/client/client"
+import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
export default {
name: "AddSalesReturnDialog",
props: {
@@ -176,48 +185,30 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {
- customName: "",
- salesReturnOrderNo: "THD20230521-11",
- selSourceOrder: "1",
- returnWarehouse: "1",
- salesHead: "5",
- returnDate: "",
- state: "",
- returnReason: ""
- }
+ infomation: {}
}
}
}
},
- components: { CommonSelectView, CommonFormTableView },
+ components: { CommonFormTableView },
computed: {},
data() {
return {
dialogWidth: "80%",
editConfig: this.editCommonConfig,
rules: {
- salesReturnOrderNo: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- returnWarehouse: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- salesHead: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ repository: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ memberId: [{ 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: "閿�鍞�荤洃" }
- ],
- selSourceOrderOptions: [{ value: "1", label: "閿�鍞槑缁嗗崟" }], // 閫夋嫨婧愬崟
- returnWarehouseOptions: [
+ memberOptions: [],
+ selSourceOrderOptions: [], // 閫夋嫨婧愬崟
+ repositoryOptions: [
{ value: "1", label: "鎬讳粨" },
{ value: "2", label: "璧犲搧浠�" },
{ value: "3", label: "鍏朵粬浠�" }
], // 閫�鍏ヤ粨搴�
- stateOptions: [], // 鐘舵��
+ statusOptions: [], // 鐘舵��
currencyOptions: [
{ value: "1", label: "浜烘皯甯�(楼)" },
{ value: "2", label: "鑻遍晳(拢)" },
@@ -235,21 +226,101 @@
},
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 === "鏂板缓") {
+ getAddSalesReturn(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 {
+ getUpdateSalesReturn(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,
+ salesReturn: {
+ clientId: data.clientId || 0,
+ memberId: data.memberId || 0,
+ number: data.number || "",
+ products: [
+ {
+ amount: 0,
+ desc: "",
+ id: 0,
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ],
+ reason: data.reason || "",
+ repository: data.repository || "",
+ returnDate: data.returnDate || "",
+ status: data.status || 0
+ }
+ }
+ return params
+ },
+ handleClose() {
+ this.editConfig.visible = false
+ },
+ // 娣诲姞闄勪欢
+ addAnnexClick() {},
+ // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
+ setFormatClick() {},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
- }
- ],
+ tableData: [],
tableColumn: [
{ label: "#", prop: "id", width: 40 },
{ label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
@@ -268,14 +339,7 @@
{ label: "鎻忚堪", prop: "other8" }
]
}
- },
- handleClose() {
- this.editConfig.visible = false
- },
- // 娣诲姞闄勪欢
- addAnnexClick() {},
- // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
- setFormatClick() {}
+ }
}
}
</script>
@@ -303,10 +367,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