Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

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 {*}  

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 => {
-						// putawayJobSubmit(params).then(res => {
+							uni.hideLoading()
-						// 	uni.hideLoading()
+							if (res.data) {
-						// 	if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data)
-						// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data)
+							} else {
-						// 	} else {
+								this.showErrorMessage("提交失败" + res.msg)
-						// 		this.showErrorMessage("提交失败" + res.msg)
+							}
-						// 	}
+						}).catch(error => {
-						// }).catch(error => {
+							uni.hideLoading()
-						// 	uni.hideLoading()
+							this.showErrorMessage(error)
-						// 	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)
 						}
 					})

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请求地址"