From 72f5ecd3e654eb94468960dc6b93ca932800ed12 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期三, 26 十月 2022 22:22:33 +0800
Subject: [PATCH] Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms
---
pages/basics/stockCheck.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index 096e13e..1022705 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -61,13 +61,14 @@
</view>
</view>
</scroll-view>
+ <y-pop title="璋冩暣"></y-pop>
<view>
<!-- 淇敼鏁伴噺 -->
<uni-popup ref="revise" background-color="#fff" @change="change">
<view class="revise-box">
<view class="revise-box-top">
<view class="color-block-blue"></view>
- <text class="title">缁勬墭鏁伴噺</text>
+ <text class="title">淇敼</text>
</view>
<view class="text-box">
<text>鍙粍鏁伴噺锛歿{enableQty}}</text>
@@ -92,7 +93,8 @@
export default {
data() {
return {
- matList:[],
+ commonUrl:null,
+ matList:[{}],
staNoList:[],
barcode: '',
staNo:'',
@@ -109,13 +111,20 @@
this.baseIP = UIP;
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
+ this.getUrl()
this.getOutBound();
},
methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
getOutBound() { // 鑾峰彇鍑哄簱鍙�
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/available/take/check/site',
+ url: that.commonUrl + '/available/take/check/site',
method: 'POST',
header: {
'token':uni.getStorageSync('token')
@@ -140,7 +149,7 @@
getCheckDetl() { // 鑾峰彇鍑哄簱鍙ｈ揣鐗╀俊鎭�
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/checkDetl/auth',
+ url: that.commonUrl + '/mobile/checkDetl/auth',
method: 'POST',
data: {
staNo:that.staNo
@@ -188,7 +197,7 @@
findMat() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+ url: that.commonUrl + '/mat/auth',
data: {
matnr:that.matnr
},
@@ -255,7 +264,7 @@
adjust() {
let that = this
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/adjust/auth',
+ url: that.commonUrl + '/adjust/auth',
method: 'POST',
data: {
combParam: that.matList
--
Gitblit v1.9.1