From 79b0a1a4f81ec7750e6deeb02bc9865785b6fee9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 17 八月 2023 19:52:46 +0800
Subject: [PATCH] bug修复
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 86 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index ae404d0..1c1bedc 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -87,7 +87,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫�璐ф棩鏈�" prop="returnDate">
- <el-date-picker v-model="editConfig.infomation.returnDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.returnDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -98,10 +103,10 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="status">
+ <el-form-item label="鐘舵��" prop="salesReturnStatusId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.status"
+ v-model="editConfig.infomation.salesReturnStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -109,7 +114,7 @@
<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"><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>
@@ -131,7 +136,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">
@@ -156,7 +161,7 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
@@ -192,6 +197,7 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import { getProductList } from "@/api/common/other"
export default {
name: "AddSalesReturnDialog",
props: {
@@ -225,7 +231,7 @@
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
repositoryOptions: [], // 閫�鍏ヤ粨搴�
statusOptions: [], // 鐘舵��
- currencyOptions: [], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
productTableList: {},
showSummary: {
show: true,
@@ -245,6 +251,7 @@
this.$store.dispatch("geClient")
this.setTableForm()
this.getCommonData()
+ this.getProductList()
},
methods: {
getCommonData() {
@@ -252,12 +259,23 @@
.then((res) => {
this.memberOptions = res.data.member
this.repositoryOptions = res.data.repository
- this.currencyOptions = res.data.currency
- this.statusOptions = res.data.status
+ // this.currencyOptions = res.data.currency
+ this.statusOptions = res.data.salesReturnStatus
})
.catch((err) => {
console.log(err)
})
+ },
+ // 鑾峰彇浜у搧鍒楄〃
+ async getProductList() {
+ await getProductList({
+ page: 0,
+ pageSize: 0,
+ productName: "",
+ productNumber: ""
+ }).then((res) => {
+ console.log(res)
+ })
},
// 淇濆瓨
saveClick(formName) {
@@ -267,37 +285,27 @@
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)
- })
+ getAddSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} 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)
- })
+ getUpdateSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$message({
+ message: "缂栬緫鎴愬姛",
+ type: "success"
+ })
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
--
Gitblit v1.8.0