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

whycq

2022-08-24 36fc4fa64ba5a7fd9f23b33c94c918d4b3ca70e3

 pages/basics/checkout.vue

@@ -1,6 +1,6 @@
<template>
   <view >
      <scroll-view scroll-y catch:touchmove="touchmove">
      <scroll-view scroll-y class="scroll-Y">
         <view class="square-2">
            <view class="square-title">
               <view class="title-sign"><view class="sign"></view></view>
@@ -9,7 +9,7 @@
            <view class="square-content">
               <view class="content-input">
                  <input v-model="barcode" type="text" placeholder="扫码 / 输入" maxlength="8" 
                  @input="findBarcode()" :focus="barcodeFocus" @focus="focuss" >
                  @input="findBarcode()" :focus="barcodeFocus" >
                  <uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
               </view>
            </view>
@@ -22,7 +22,7 @@
            <view class="square-content">
               <view class="content-input-combox" style="width: 94%;">
                  <input style="width: 90%;" type="text" v-model="matnr" placeholder="扫码 / 输入" @input="findMat()":focus="focus"
                   @focus="focuss">
                  >
                  <!-- @focus="focuss" -->
                  <uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
               </view>
@@ -33,10 +33,11 @@
            <view class="square-title">
               <view class="title-sign"><view class="sign"></view></view>
               <view class="title-text"><text>商品列表</text></view>
               <view v-show="matCount > 0" style="display: inline-block;float: right;height: 100rpx;line-height: 100rpx;margin-right: 50rpx;">请扫码选取 {{matCount}} 件商品</view>
            </view>
         </view>
         <view class="square-none" v-show="matList.length === 0">
            <view class="v-show">请扫码选取 {{matCount}} 件商品</view>
            <view class="v-show">暂无更多数据. . . </view>
         </view>
         <checkbox-group @change="checkbox">
            <view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
@@ -72,6 +73,7 @@
   export default {
      data() {
         return {
            commonUrl:null,
            barcode: '',
            barcodeFocus:true,
            focus:false,
@@ -83,14 +85,14 @@
            matList:[],
            result: '',
            siteList:[],
            desc:'',
            staNoList:[],
            satNo:'',
            listLen:0,
            msgType: 'success',
            messageText: '这是一条成功提示',
            fontColor:{color:'red'},
            matCount:'0'
            matCount:'',
            wrkNo:'',
         }
      },
      onReady() {
@@ -99,38 +101,52 @@
            // this.getMatListLen()
         },1000)
      },
      onLoad() {
         // #ifdef APP
         setInterval(()=>{
            uni.hideKeyboard()
         },20)
         // #endif
      },
      mounted(){
         const UIP = uni.getStorageSync('UIP');
         this.baseIP = UIP;
         const UPORT = uni.getStorageSync('UPORT');
         this.basePORT = UPORT
			
         const PROJ = uni.getStorageSync('UPROJ');
         this.baseUrl = PROJ
         this.getUrl()
      },
      methods: {
         // 获取url
         getUrl() {
            this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
         },
         // 出库分为两种 一:全板出库 扫描托盘码显示全板商品 可以直接确认 二是减料出库 扫描托盘码提示需要出库数量  扫描货品条码达到最大出库数量即可
         messageToggle(type) {
            this.msgType = type
            this.messageText = `这是一条${type}消息提示`
            this.$refs.message.open()
         },
         choseStaNo() {
            for (var i = 0;i < this.staNoList.length; i++) {
               if (this.desc == this.staNoList[i].desc) {
                  this.staNo = this.staNoList[i].siteId
               } 
            }
         },
         getMatListLen() {
            // this.listLen = this.matList.length;
         },
         focuss() {
            // uni.hideKeyboard()
            let that = this;
            that.barcodeFocus = false;
            setTimeout(()=>{
               that.barcode = ''
               that.barcodeFocus = true;
            }, 100);
         },
         resst() {
            this.matList = []
            this.barcode = ''
            this.matnr = ''
            this.desc = ''
            this.matCount = ''
            this.removeBarcode();
            uni.vibrateShort();
				
         },
         removeBarcode() {
            this.barcode = ''
@@ -139,6 +155,16 @@
            this.$nextTick(function() {
               this.barcodeFocus = true;
            });
         },
         foucss() {
            // #ifdef APP
            let that = this;
            that.focus = false;
            setTimeout(()=>{
               that.matnr = '';
               that.focus = true;
            }, 100);
            // #endif
         },
         removeMatnr() {
            this.matnr = ''
@@ -179,7 +205,7 @@
         findBarcode() {
            let that = this
            uni.request({
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth/v2',
                url: that.commonUrl + '/mobile/pakout/confirm/barcode/auth',
                data: {
                  barcode:that.barcode
                },
@@ -189,8 +215,17 @@
               success(result) {
                  let res = result.data;
                  if (res.code === 200) {
                     if (res.data) {
                        that.matCount = res.data.length
                     if (res.data.ioType === 101) {
                        that.matList = res.data.list.concat(that.matList)
                        that.listLen = that.matList.length;
                        that.foucss();
                        return;
                     }
                     if (res.data.ioType === 103 || res.data.ioType === 104 || res.data.ioType === 107) {
                        that.matCount = res.data.list.length
                        that.wrkNo = res.data.list[0].wrkNo
                        that.foucss();
                        return;
                     }
                  } else if (res.code === 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -201,6 +236,7 @@
                     }, 1000);
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                     that.focuss()
                  }
                  
               }
@@ -209,10 +245,18 @@
         },
         findMat() {
            let that = this
            if(that.barcode == '') {
               uni.showToast({title: '请先扫描托盘码！', icon: "none",position: 'top'})
               that.focuss()
               setTimeout(function() {
                  that.matnr = ''
               }, 100);
               return;
            }
            uni.request({
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth/v2',
                url: that.commonUrl + '/mobile/pakout/confirm/pick/auth',
                data: {
                  staNo:that.staNo,
                  wrkNo:that.wrkNo,
                  matnr:that.matnr
                },
                header: {
@@ -221,27 +265,24 @@
               success(result) {
                  var res = result.data;
                  if(res.code === 200 ) {
                     if(res.data) {
                        for(let i = 0;i<that.matList.length;i++) {
                           for (let j = 0;j < res.data.length; j++) {
                              if(JSON.stringify(that.matList[i]) === JSON.stringify(res.data[j])) {
                                 res.data.splice(j,1)
                              }
                     var add = true
                     if(res.data) { 
                        console.log(that.matnr);
                        for(let i = 0;i < that.matList.length; i++) {
                           var matnr = that.matList[i].matnr + '-' +  that.matList[i].batch
                           console.log(matnr);
                           if (matnr === that.matnr) {
                              that.messageToggle('warn');
                              that.messageText = '该商品已添加';
                              that.foucss();
                              add = false
                           }
                        }
                        if (that.matList.length < that.matCount) {
                           that.matList = res.data.concat(that.matList)
                        if (add) {
                           that.matList.unshift(res.data);
                           that.listLen = that.matList.length;
                           that.focus = false;
                           that.$nextTick(function() {
                              that.focus = true;
                           });
                           that.matnr = ''
                        } else {
                           that.messageToggle('warn')
                           that.messageText = '商品已全部添加'
                           that.foucss();
                        }
								
                     }
                  } else if (res.code == 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
@@ -252,23 +293,39 @@
                     }, 1000);
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                     that.foucss();
                  }
                  
               }
            });
         },
         comb() {
            uni.vibrateShort();
            let that = this;
            uni.showLoading();
            if (that.barcode === '') {
               this.messageToggle('error')
               this.messageText = '请扫描托盘码'
               return;
            }
            if (that.barcode.length !== 8) {
               this.messageToggle('error')
               this.messageText = '托盘码必须为8位'
               return;
            }
            if (that.matList.length === 0) {
               this.messageToggle('error')
               this.messageText = '请添加商品列表'
               return;
            }
				
            if (that.matList.length < that.matCount) {
               var len = that.matCount - that.matList.length
               that.messageToggle('error')
               that.messageText = '还剩' + len + '件未扫描'
               return;
            }
            uni.showLoading();
            uni.request({
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/confirm/auth',
                url: that.commonUrl + '/mobile/pakout/confirm/auth',
                data: that.matList,
               method: 'POST',
                header: {
@@ -278,15 +335,8 @@
                  uni.showLoading();
                  var res = result.data
                  if (res.code === 200) {
                     uni.showToast({
                        title: res.msg,
                        position: 'bottom',
                        duration: 1000
                     });
                     that.matList = []
                     that.barcode = ''
                     that.matnr = ''
                     that.desc = ''
                     uni.showToast({ title: res.msg,position: 'bottom',duration: 1000});
                     that.resst();
                  } else if (res.code == 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
                     setTimeout(() => {
@@ -339,7 +389,7 @@
<style>
   /* @import "../../colorui/main.css";
   @import "../../colorui/icon.css"; */
	

   .pak-seach-box {
      background-color: #FFFFFF;
      margin: 15rpx 15rpx 0rpx 15rpx;