From 8edcbd986b0fee1e7d94fcfd69e619d4ab58ded2 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 23 二月 2022 16:59:45 +0800
Subject: [PATCH] #
---
/dev/null | 0
pages/basics/stockQuery.vue | 11 +
pages/login/login.vue | 6
pages/basics/combPro.vue | 21 +++
pages/basics/stockCheck.vue | 203 ++++++++++++++++++++++++++++++++++++----
pages/basics/comb.vue | 14 ++
6 files changed, 220 insertions(+), 35 deletions(-)
diff --git a/pages/basics/comb.vue b/pages/basics/comb.vue
index c547021..5110bf7 100644
--- a/pages/basics/comb.vue
+++ b/pages/basics/comb.vue
@@ -138,9 +138,12 @@
that.unit = data.unit
}
} else if (res.data.code ===403 ){
- // 寰呭畾
+ uni.navigateBack({
+ delta: 1
+ })
} else {
- // 寰呭畾
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
@@ -235,9 +238,12 @@
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
}else if(res.data.data===403){
-
+ uni.navigateBack({
+ delta: 1
+ })
}else {
-
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
})
diff --git a/pages/basics/combPro.vue b/pages/basics/combPro.vue
index d7199a1..7180951 100644
--- a/pages/basics/combPro.vue
+++ b/pages/basics/combPro.vue
@@ -70,11 +70,15 @@
rowNum:'',
value:'',
couChange:true,
+ baseIP:'',
}
},
-
+ mounted(){
+ const UIP = uni.getStorageSync('UIP');
+ this.baseIP = UIP
+ },
methods: {
reset:function() {
this.billNo = '';
@@ -114,9 +118,12 @@
if(res.data.data != null){
that.addTableData(res.data.data)
}else if(res.data.code === 403){
-
+ uni.navigateBack({
+ delta: 1
+ })
}else {
-
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
}
@@ -193,12 +200,18 @@
},
method:'POST',
success(res) {
-
if(res.data.code === 200){
that.reset()
that.matData = []
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
+ } else if (res.data.code === 403) {
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
})
diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue
index ace4fcf..0ebf701 100644
--- a/pages/basics/stockCheck.vue
+++ b/pages/basics/stockCheck.vue
@@ -20,19 +20,24 @@
<uni-th width="100">浜у搧ID</uni-th>
<uni-th width="100">浜у搧鍚嶇О</uni-th>
<uni-th width="100">搴撲綅</uni-th>
+ <uni-th width="100">纭鏁伴噺</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in locDetlData" :key="index">
<uni-td>{{item.count}}</uni-td>
<uni-td>{{item.matNo}}</uni-td>
<uni-td>{{item.matName}}</uni-td>
<uni-td>{{item.locNo}}</uni-td>
+ <uni-td align="center">
+ <button class="uni-button" size="mini" type="primary" @click="conf(index,item)">淇敼</button>
+ <button class="uni-button" size="mini" type="warn" @click="remove(index,item)">鍒犻櫎</button>
+ </uni-td>
</uni-tr>
</uni-table>
</view>
<view>
- <button class="cu-btn bg-yellow pda-btn">纭� 璁�</button>
- <button class="cu-btn bg-grey pda-btn">閲� 缃�</button>
+ <button class="cu-btn bg-yellow pda-btn" @click="check">纭� 璁�</button>
+ <button class="cu-btn bg-grey pda-btn" @click="reset">閲� 缃�</button>
</view>
<view>
<uni-popup ref="popup" background-color="#fff" style="width: 500rpx;">
@@ -60,7 +65,7 @@
<text class="title">鏁伴噺</text>
<uni-number-box @change="countDom" v-model="count" />
</view>
- <button class="cu-btn bg-yellow pda-btn2" @click="confirm">琛ュ厖</button>
+ <button class="cu-btn bg-yellow pda-btn2" @click="confirm">鎻愬彇</button>
</view>
</uni-popup>
@@ -78,6 +83,8 @@
export default {
data() {
return {
+ msgType: '',
+ messageText: '',
index: 0,
array: [],
matBtn:'',
@@ -91,11 +98,19 @@
type: '',
msgType:'',
messageText:'',
+ baseIP:'',
+ outlet:'',
+ checkList:[],
+ sourceList:[],
+ minCount:0,
}
},
- onLoad(){
- let that = this
+ mounted(){
+ // 鑾峰彇IP绔彛
+ const UIP = uni.getStorageSync('UIP');
+ this.baseIP = UIP
// 鑾峰彇鍑哄簱鍙�
+ let that = this
uni.request({
url: that.baseHttp + that.baseIP + that.baseUrl + "/available/take/check/site",
header: {
@@ -111,10 +126,48 @@
})
},
methods: {
- bindPickerChange: function(e) {
- this.index = e.detail.value
+ // 鎻愮ず绐楀彛
+ messageToggle(type) {
+ this.msgType = type
+ this.messageText = '鎻愬彇澶辫触'
+ this.$refs.message.open()
},
- // 鎻愬彇
+ // 鍑哄簱鍙�:180绛�
+ bindPickerChange: function(e) {
+ let that = this
+ that.index = e.detail.value
+ that.outlet = that.array[that.index]
+ uni.request({
+ url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/check/queryMatFromDevNo?devNo=" + that.outlet,
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ method:'GET',
+ async:false,
+ success(res){
+ if(res.data.code === 200){
+ console.log(1)
+ that.locDetlData = res.data.data
+ if(res.data.data && res.data.data.length > 0){
+ res.data.data.map(function(item){
+ that.souceData.push(item)
+ console.log(that.souceData)
+ })
+ }
+ } else if (res.data.code = 403){
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ this.messageToggle('error')
+ this.messageText = res.data.msg
+ }
+ }
+
+ })
+
+ },
+ // 鐐瑰嚮琛ュ厖鐨勫脊绐�
toggle(type) {
this.type = type
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
@@ -128,6 +181,7 @@
countDom(value) {
},
+ // 鏍规嵁浜у搧ID鏌ヨ浜у搧璇︽儏
find(){
let that = this
let thatId = that.matNo
@@ -154,13 +208,23 @@
that.unit = data.unit
}
} else if (res.data.code ===403 ){
- // 寰呭畾
+ uni.navigateBack({
+ delta: 1
+ })
} else {
- // 寰呭畾
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
})
},
+ // 鍒犻櫎
+ remove(index,item){
+ this.matData.splice(index,1)
+ this.messageToggle('success')
+ this.messageText = '鍒犻櫎鎴愬姛'
+ },
+ // 寮圭獥 纭琛ュ厖
confirm(){
let that = this
let data = {
@@ -171,18 +235,32 @@
that.addTableData(data)
},
- initTableData(data){
- for(var i=0;i<data.length;i++){
- var toPush =true
- for(var j = 0; j<this.locDetlDate.length;j++){
- if (data[i].matNo === this.locDetlData[j].matNo && data[i].locNo === this.locDetlData[j].locNo) {
- toPush = false;
- }
- }
- if(toPush){
- this.locDetlDate.push(data[i])
- }
+ // 淇敼鏁伴噺
+ conf(){
+ let that = this
+ let data = {
+ matNo:that.matNo,
+ matName:that.matName,
+ count:that.count
}
+ for (var j = 0; j < that.locDetlData.length; j++) {
+ if (matNo === that.locDetlData[j].matNo && locNo === that.locDetlData[j].locNo) {
+ if (that.count < that.minCount) {
+ that.messageToggle('error')
+ that.messageText = '鏁伴噺蹇呴』澶т簬0'
+ return;
+ }
+ that.locDetlData[j].count = Number(that.count);
+ }
+ }
+ that.messageToggle('success')
+ that.messageText = '淇敼鎴愬姛'
+ },
+ // 绉婚櫎鐗╂枡
+ remove(index,item){
+ this.matData.splice(index,1)
+ this.messageToggle('success')
+ this.messageText = '鍒犻櫎鎴愬姛'
},
addTableData(data){
let that = this
@@ -191,7 +269,6 @@
that.messageText = '鎻愬彇澶辫触'
return
}
- this.$refs.popup.close()
var toPush = true
for (var j = 0; j < this.locDetlData.length; j++) {
if (data.matNo === this.locDetlData[j].matNo && data.locNo === this.locDetlData[j].locNo) {
@@ -207,8 +284,90 @@
}
locDetlData.push(pushData);
}
+ this.$refs.popup.close()
},
+ initTableData(data){
+ for(var i=0;i<data.length;i++){
+ var toPush =true
+ for(var j = 0; j<this.locDetlDate.length;j++){
+ if (data[i].matNo === this.locDetlData[j].matNo && data[i].locNo === this.locDetlData[j].locNo) {
+ toPush = false;
+ }
+ }
+ if(toPush){
+ this.locDetlDate.push(data[i])
+ }
+ }
+ },
+ // 閲嶇疆
+ reset(){
+ this.array = []
+ this.locDetlData = [];
+ this.checkList = []
+ this.sourceList = []
+ },
+ check(){
+ if(this.souceData.length === 0) {
+ this.messageToggle('error')
+ this.messageText = '绔欑偣鏃犺揣锛屾棤娉曠洏鐐�'
+ return
+ }
+ if(this.locDetlData.length > 0) {
+ for(var i = 0; i < that.locDetlData.length; i++){
+ if (that.locDetlData[i].count === null || that.locDetlData[i].count === 0 ||
+ that.locDetlData[i].count === undefined) {
+ this.messageToggle('error')
+ this.messageText = that.locDetlData[i].matNo + '鍟嗗搧鏁伴噺閿欒'
+ return
+ }
+ }
+ }
+ if (this.locDetlData.length > 0) {
+ this.locDetlData.map(function (item) {
+ this.checkList.push({
+ locNo: item.locNo,
+ matNo: item.matNo,
+ checkQty: item.count
+ });
+ });
+ }
+ if (this.souceData.length > 0) {
+ this.souceData.map(function (item) {
+ this.sourceList.push({
+ locNo: item.locNo,
+ matNo: item.matNo,
+ count: item.count
+ });
+ });
+ }
+ uni.request({
+ url: that.baseHttp + that.baseIP + that.baseUrl + "/mobile/stock/check",
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ data: JSON.stringify({
+ checkList: this.checkList
+ }),
+ method:'POST',
+ async:false,
+ success(res){
+ if(res.data.code === 200){
+ this.reset();
+ this.messageToggle('success')
+ this.messageText = '鐩樼偣鎴愬姛'
+ } else if (res.data.code === 403) {
+ uni.navigateBack({
+ delta: 1
+ })
+ } else {
+ this.messageToggle('error')
+ this.messageText = res.data.msg
+ }
+
+ }
+ })
+ }
}
}
</script>
diff --git a/pages/basics/stockQuery.vue b/pages/basics/stockQuery.vue
index 075263b..df2f787 100644
--- a/pages/basics/stockQuery.vue
+++ b/pages/basics/stockQuery.vue
@@ -40,6 +40,10 @@
locDetlData:[],
}
},
+ mounted(){
+ const UIP = uni.getStorageSync('UIP');
+ this.baseIP = UIP
+ },
methods: {
reset:function() {
let that = this;
@@ -81,9 +85,12 @@
if(res.data.data != null){
that.locDetlData = res.data.data
} else if (res.data.code ===403){
-
+ uni.navigateBack({
+ delta: 1
+ })
} else {
-
+ this.messageToggle('error')
+ this.messageText = res.data.msg
}
}
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c47ba4f..82bb028 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -113,6 +113,7 @@
const UIP = uni.getStorageSync('UIP');
if (UIP) {
that.IP = UIP;
+ that.baseIP = UIP;
} else {
that.IP = '';
}
@@ -148,10 +149,9 @@
this.$refs.inputDialog.open()
},
dialogInputConfirm(type){
- this.UIP = type
- uni.setStorageSync('UIP',type)
this.baseIP = type
-
+ // 瀛樺叆鏈湴缂撳瓨
+ uni.setStorageSync('UIP',this.baseIP)
},
checkboxChange: function(e) {
if (e.detail.value.length == 1) {
diff --git a/unpackage/release/apk/__UNI__DA5854D__20220215165642.apk b/unpackage/release/apk/__UNI__DA5854D__20220215165642.apk
deleted file mode 100644
index e69973f..0000000
--- a/unpackage/release/apk/__UNI__DA5854D__20220215165642.apk
+++ /dev/null
Binary files differ
diff --git a/unpackage/release/apk/__UNI__DA5854D__20220221100741.apk b/unpackage/release/apk/__UNI__DA5854D__20220221100741.apk
deleted file mode 100644
index 751def5..0000000
--- a/unpackage/release/apk/__UNI__DA5854D__20220221100741.apk
+++ /dev/null
Binary files differ
diff --git a/unpackage/release/apk/__UNI__DA5854D__20220221155538.apk b/unpackage/release/apk/__UNI__DA5854D__20220221155538.apk
deleted file mode 100644
index 84d7db7..0000000
--- a/unpackage/release/apk/__UNI__DA5854D__20220221155538.apk
+++ /dev/null
Binary files differ
diff --git a/unpackage/release/apk/__UNI__DA5854D__20220222131616.apk b/unpackage/release/apk/__UNI__DA5854D__20220222131616.apk
deleted file mode 100644
index 0e5d018..0000000
--- a/unpackage/release/apk/__UNI__DA5854D__20220222131616.apk
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1