Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms

whycq

2022-08-24 36fc4fa64ba5a7fd9f23b33c94c918d4b3ca70e3

 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;