From aacccb8de1a63ff1de51424fc7bfab09092e32ef Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 27 Nov 2023 15:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99=E4=B8=8A?=
=?UTF-8?q?=E6=9E=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/request2.js | 4 ++--
pages/putaway/job/putawayDetail.vue | 37 +++++++++++++++++++----------
static/config.json | 2 +-
3 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/api/request2.js b/api/request2.js
index fdb5b334..95074fb1 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1,8 +1,8 @@
import request from '@/api/httpRequest2.js'
-const baseApi = "/api/admin-api"
+// const baseApi = "/api/admin-api"
//公司地址
// 本地地址
-// const baseApi = "/admin-api"
+const baseApi = ""
/**
* 获取验证码
* @param {*}
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 7e779048..dd373dc9 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -398,18 +398,17 @@
this.managementList = res.list;
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
-
- // putawayJobSubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data)
- // } else {
- // this.showErrorMessage("提交失败" + res.msg)
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
+ putawayJobSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data)
+ } else {
+ this.showErrorMessage("提交失败" + res.msg)
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
@@ -420,7 +419,6 @@
setParams() {
var subList = []
var creator = this.$store.state.user.id
-
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
@@ -428,6 +426,19 @@
detail.packingNumber, detail.batch);
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
+ detail.toContainerNumber = '';
+ detail.toInventoryStatus = detail.inventoryStatus;
+
+
+ detail.singlePrice = detail.balance.singlePrice;
+ detail.amount = detail.balance.singlePrice * detail.handleQty;
+
+ detail.arriveDate = detail.balance.arriveDate;
+ detail.produceDate = detail.balance.produceDate;
+ detail.expireDate = detail.balance.expireDate;
+ // "arriveDate": 1694591614000,
+ // "produceDate": 1694591615000,
+ // "expireDate": 1694591617000,
subList.push(detail)
}
})
diff --git a/static/config.json b/static/config.json
index d48501b3..b7d517fc 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
"request_url": {
"name": "request_url",
- "value": "http://dev.ccwin-in.com:25100",
+ "value": "http://192.168.0.157:12080/admin-api",
"dev":"http://dev.ccwin-in.com:25100/api",
"local":"http://localhost:12080",
"desc": "api请求地址"