From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/operate/scrap/AddScrapDialog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 73911a4..b877a3e 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -168,7 +168,7 @@
currentState: "todo", // 褰撳墠鐘舵��
unit: "",
showButton: true,
- isValidateClick: false // 楠岃瘉鏄惁鏄剧ず
+ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず
}
},
created() {
@@ -267,12 +267,9 @@
} else if (this.editCommonConfig.title === "缂栬緫") {
this.$refs[formName].validate((valid) => {
if (valid) {
- this.editConfig.infomation.productId = this.productId
- this.editConfig.infomation.productName = this.productName
- this.editConfig.infomation.unit = this.unit
- updateScrap({
- amount: this.editConfig.infomation.amount, //鏁伴噺
- baseOperationType: 1,
+ let params={
+ amount: this.editConfig.infomation.amount,
+ baseOperationType: this.editConfig.infomation.baseOperationType,
fromLocationId: this.editConfig.infomation.fromLocationId,
id: this.editConfig.infomation.id,
number: this.editConfig.infomation.number,
@@ -281,7 +278,10 @@
sourceNumber: this.editConfig.infomation.sourceNumber,
status: this.editConfig.infomation.status,
toLocationId: this.editConfig.infomation.toLocationId
- }).then((res) => {
+ }
+ updateScrap(
+ params
+ ).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
--
Gitblit v1.8.0