From 563c60ab9d465e275bf18b57fde7b51c4bc020da Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 29 十一月 2023 15:32:56 +0800
Subject: [PATCH] 出入库明细单打印功能调整，新引入三方库:html2Canvas,jsPdf,vue-office
---
src/views/operate/scrap/AddScrapDialog.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue
index 73911a4..ab6c744 100644
--- a/src/views/operate/scrap/AddScrapDialog.vue
+++ b/src/views/operate/scrap/AddScrapDialog.vue
@@ -195,7 +195,7 @@
// 鑾峰彇浠撳簱浣嶇疆鍒楄〃
async getLocationList() {
await getLocationList({
- keyWord: "",
+ isScrapLocation: true,
page: 0,
pageSize: 0
}).then((res) => {
@@ -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,8 @@
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