From 36fc4fa64ba5a7fd9f23b33c94c918d4b3ca70e3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 24 八月 2022 12:17:37 +0800
Subject: [PATCH] Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms
---
pages/basics/outPakin.vue | 246 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 184 insertions(+), 62 deletions(-)
diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 062a4b0..2b42673 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -64,6 +64,29 @@
<uni-popup-message :type="msgType" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
+ <!-- 纭浠撳簱寮圭獥 -->
+ <view>
+ <uni-popup ref="checkOrigin" type="center" backgroundColor="#fff">
+ <view class="origin-box">
+ <view class="square-title">
+ <view class="title-sign"><view class="sign"></view></view>
+ <view class="title-text"><text>纭浠撳簱</text></view>
+ </view>
+
+ <view style="width: 100%;">
+ <radio-group @change="radioChange" style="display: block;">
+ <label class="radio" v-for="(origin, index) in origins" :key="origins.value">
+ <radio style="transform:scale(0.7)" :value="origin.value" :checked="index === current" />{{origin.value}}
+ </label>
+ </radio-group>
+ </view>
+
+ <view class="pop-btn flex justify-around">
+ <button class="cu-btn bg-blue lg" @click="check()">纭</button>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
@@ -72,6 +95,7 @@
export default {
data() {
return {
+ commonUrl:null,
barcode: '',
barcodeFocus:true,
focus:false,
@@ -85,6 +109,10 @@
listLen:0,
msgType: 'success',
messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
+ origins: [{value:'1288'},{value:'5055'}],
+ origin: null, // 浠撳簱
+ current: 0,
+ isNum:false
}
},
mounted(){
@@ -92,6 +120,9 @@
this.baseIP = UIP;
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
+ this.getUrl()
},
onLoad() {
// #ifdef APP
@@ -101,6 +132,64 @@
// #endif
},
methods: {
+ // 鑾峰彇url
+ getUrl() {
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
+ },
+ radioChange(evt) {
+ for (let i = 0; i < this.origins.length; i++) {
+ if (this.origins[i].value === evt.detail.value) {
+ this.current = i;
+ break;
+ }
+ }
+ },
+ // 纭鍑哄簱鍙�
+ check() {
+ let that = this
+ if (this.current == 0) {
+ this.origin = 1288
+ } else {
+ this.origin = 5055
+ }
+ this.$refs.checkOrigin.close()
+ uni.request({
+ url: that.commonUrl + '/mobile/comb/auth',
+ data: JSON.stringify({
+ barcode: that.barcode,
+ origin: that.origin,
+ combMats: that.matList
+ }),
+ method: 'POST',
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ success(result) {
+ uni.showLoading();
+ var res = result.data
+ if (res.code === 200) {
+ uni.showToast({
+ title: res.msg,
+ position: 'bottom',
+ duration: 1000
+ });
+ that.barcode = '';
+ that.matList = '';
+ that.matList = [];
+ that.barcodeFocuss();
+ } else if (res.code == 403) {
+ uni.showToast({title: res.msg, icon: "none", position: 'top'})
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '../login/login'
+ });
+ }, 1000);
+ } else {
+ uni.showToast({title: res.msg, icon: "none",position: 'top'})
+ }
+ }
+ });
+ },
nextInput() {
if (this.barcode.length == 8) {
this.foucss()
@@ -168,54 +257,66 @@
uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
return;
}
- uni.showLoading();
- uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/comb/auth',
- data: JSON.stringify({
- barcode: that.barcode,
- combMats: that.matList
- }),
- method: 'POST',
- header: {
- 'token':uni.getStorageSync('token')
- },
- success(result) {
- uni.showLoading();
- var res = result.data
- if (res.code === 200) {
- uni.showToast({
- title: res.msg,
- position: 'bottom',
- duration: 1000
- });
- that.barcode = '';
- that.matList = '';
- that.matList = [];
- that.barcodeFocuss();
- } else if (res.code == 403) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({title: res.msg, icon: "none",position: 'top'})
- }
- }
- });
+ // uni.showLoading();
+ that.$refs.checkOrigin.open()
+
},
+ // 杈撳叆鐨勪笉鏄暟瀛楃殑鎺掗櫎
checkNum(theObj) {
var reg = /^[0-9]*$/;
if (!reg.test(theObj)) {
- this.messageToggle('warn');
- this.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯';
- this.foucss();
- return;
+ this.isNum = false;
+ return ;
}
+ var year = theObj.substring(0,2)
+ //鑾峰彇褰撳墠骞翠唤
+ var dt = new Date();
+ var thisYear = new Date().getFullYear() + ''
+ thisYear = thisYear.substring(2,4)
+ if(year > thisYear) {
+ this.isNum = false;
+ return ;
+ }
+ this.isNum = true;
},
+ // 娣诲姞鎵弿鏃ュ織
+ addLog(matCode,userName) {
+
+ let that = this;
+ uni.request({
+ url: that.commonUrl + "/mobile/addLog/auth",
+ data: {
+ matcode:matCode,
+ username:userName
+ },
+ header: {
+ 'token':uni.getStorageSync('token')
+ },
+ // method:"POST",
+ success(result) {
+ var res = result.data
+ if(res.code === 200) {
+ // uni.showToast({title: "娣诲姞鎴愬姛", icon: "none",position: 'center'})
+ }
+ }
+ })
+
+ },
+ // 妫�绱㈠晢鍝�
findMat() {
let that = this
+ let userName = uni.getStorageSync('HCuname')
+ let matCode = that.matnrId
+ // 寮�鍚壂鎻忔棩蹇�
+ that.addLog(matCode,userName)
+ // that.foucss();
+ // return;
+ if(that.matList.length > 15) {
+ that.messageToggle('warn');
+ that.messageText = '缁勬墭鍟嗗搧鏁伴噺宸茶秴杩�16浠讹紝璇峰畬鎴愬綋鍓嶇粍鎵�';
+ that.foucss();
+ return;
+ }
if (that.matnrId.length > 25){
that.messageToggle('warn');
that.messageText = '鍟嗗搧缂栫爜瓒呴暱锛岃閲嶈瘯';
@@ -224,8 +325,39 @@
}
let str = that.matnrId.split('-')
let matnr = str[0] + '-' + str[1]
+ // 妫�鏌ユ潯鐮佷腑闈炴暟瀛�
that.checkNum(str[2])
- console.log("--++")
+ // 妫�鏌ュ簭鍒楃爜闀垮害
+ if (str[2].length != 11) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮侀暱搴︽湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ // 妫�鏌ュ勾浠�
+ var dt = new Date();
+ var year = (dt.getFullYear() + '').substring(2,4)
+ var month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
+ if (str[2].substring(0,2) > year) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮佸勾浠芥湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ // 妫�鏌ユ湀浠�
+ if (str[2].substring(2,4) > 12) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧搴忓垪鐮佹湀浠芥湁璇紝璇烽噸璇曪紒';
+ that.foucss();
+ return;
+ }
+ if (str)
+ if (that.isNum == false) {
+ that.messageToggle('warn');
+ that.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯锛�';
+ that.foucss();
+ return;
+ }
for (let k = 0; k < that.matList.length;k++) {
if (that.matList[k].matnr != matnr) {
that.messageToggle('warn');
@@ -234,11 +366,13 @@
return;
}
}
- uni.showLoading();
+
+ // return;
+ // uni.showLoading();
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+ url: that.commonUrl + '/barcode/check/auth',
data: {
- matnr:matnr
+ barcode:that.matnrId
},
header: {
'token':uni.getStorageSync('token')
@@ -301,25 +435,13 @@
/* @import "../../colorui/main.css";
@import "../../colorui/icon.css"; */
/*
- 1101842-10000-220475159999
- 1101842-10000-22047518494
- 1101842-10000-22047518532
- 1101842-10000-2204751599A
- 1101842-12345-22047515990
- 1101842-10000-22047515997
- 1101842-10000-22047518515
- 1101842-10000-22047515778
- 1101842-10000-22047515938
- 1101842-10000-22047518518
- 1101842-10000-22047518517
- 1101842-10000-22047515967
- 1101842-10000-22047518472
- 1101842-10000-22047518516
- 1101842-10000-22047518511
- 1101842-10000-22047515864
- 1101842-10000-22047515889
- */
+ */
+ .pop-btn {
+ position: absolute;
+ width: 100%;
+ bottom: 20rpx;
+ }
.pak-seach-box {
background-color: #FFFFFF;
margin: 15rpx 15rpx 0rpx 15rpx;
--
Gitblit v1.9.1