Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda

whycq

2024-11-19 fe8fb74ce94e7bee23ed47b7175236248ac93b98

 pages/pakin/pakin.vue

@@ -1,5 +1,6 @@
<template>
   <view>
      <!-- ----------------------------------------------程序标题栏----------------------------------------------------------- -->
      <view class="status_bar">
         <!-- 这里是状态栏 -->
      </view>
@@ -14,6 +15,9 @@
            </view>
         </block>
       </uni-nav-bar>
      <!-- ----------------------------------------------程序标题栏----------------------------------------------------------- -->
		 
      <!-- ----------------------------------------------  输入框  ----------------------------------------------------------- -->
      <view class="code">
         <view class="item">
            <view class="code-decs">托盘码:</view>
@@ -42,7 +46,7 @@
            </radio-group>
         </view>
      </view>
		
      <!-- ----------------------------------------------  输入框  ----------------------------------------------------------- -->
      <view class="mat-list-title">
         商品列表
      </view>
@@ -191,7 +195,10 @@
         }
      },
      onLoad() {

         this.dataList = uni.getStorageSync('pakinDataList')
         if (this.dataList === '') {
            this.dataList = []
         }
      },
      onShow() {
         this.baseUrl = uni.getStorageSync('baseUrl');
@@ -231,11 +238,7 @@
            setTimeout(() => {
               var len = this.barcode.length
               if (len != 8) {
                  uni.showToast({
                     title: '托盘码有误请重试',
                     icon: "none",
                     position: 'top'
                  });
                  uni.showToast({ title: '托盘码有误请重试', icon: "none", position: 'top' });
                  this.barcodeFocuss()
                  return;
               }
@@ -293,22 +296,14 @@
                        },
                     });
                  } else if (result.code == 403) {
                     uni.showToast({
                        title: result.msg,
                        icon: "none",
                        position: 'top'
                     })
                     uni.showToast({ title: result.msg, icon: "none", position: 'top' })
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                  } else {
                     uni.showToast({
                        title: result.msg,
                        icon: "none",
                        position: 'top'
                     })
                     uni.showToast({ title: result.msg, icon: "none", position: 'top' })
                  }

               }
@@ -367,6 +362,7 @@
            if (add) {
               this.dataList.unshift(mat)
            }
            uni.setStorageSync('pakinDataList', this.dataList);
         },
         // 修改批号
         revise(item, i) {
@@ -391,9 +387,8 @@
         },
         // 确认移除
         removeConfirm() {
            this.messageText = "移除成功"
            this.messageToggle('success')
            this.dataList.splice(this.removeNum, 1)
            uni.showToast({ title: '移除成功', icon: "error", position: 'top' });
         },
         // 取消移除
         removeClose() {
@@ -404,8 +399,7 @@
            this.dataList[this.rowNum].batch = this.batch
            this.dataList[this.rowNum].weight = this.weight
            this.matnr = ''
            this.messageText = "修改成功"
            this.messageToggle('success')
            uni.showToast({ title: '移除成功', icon: "success", position: 'top' });
            this.$refs.revise.close()
         },
         reviseClose() {
@@ -427,26 +421,23 @@
            uni.vibrateShort();
            let that = this;
            if (that.barcode === '') {
               this.messageText = "请扫描托盘条码"
               this.messageToggle('error')
               uni.showToast({ title: '请扫描托盘条码', icon: "error", position: 'top' });
               return;
            }
            if (that.dataList.length === 0) {
               this.messageText = "请添加商品列表"
               this.messageToggle('error')
               uni.showToast({ title: '请添加商品列表', icon: "error", position: 'top' });
               return;
            }
            for (var i = 0; i < that.dataList.length; i++) {
               if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
                  this.messageText = that.dataList[i].matnr + '组托数量不能为0'
                  this.messageToggle('error')
                  uni.showToast({ title: that.dataList[i].matnr + '组托数量不能为0', icon: "error", position: 'top' });
                  return;
               }
            }
            uni.request({
               url: that.baseUrl + '/mobile/comb/auth',
               data: JSON.stringify({
                  owner: that.storeId,
                  owner: that.store,
                  fullPlt: that.fullPlt,
                  barcode: that.barcode,
                  combMats: that.dataList
@@ -464,17 +455,15 @@
                     const innerAudioContext = uni.createInnerAudioContext();
                     innerAudioContext.src = '/static/music/pakinOk.mp3';
                     innerAudioContext.play()
                     that.dataList = []
                     uni.setStorageSync('pakinDataList', that.dataList);
                  } else if (res.code == 403) {
                     that.messageText = res.msg
                     that.messageToggle('error')
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' });
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                        uni.reLaunch({ url: '../login/login' });
                     }, 1000);
                  } else {
                     that.messageText = res.msg
                     that.messageToggle('error')
                     uni.showToast({ title: res.msg, icon: "error", position: 'top' });
                  }
               }
            });
@@ -508,6 +497,9 @@
<style>
   @import url('../../static/css/wms.css/wms.css');

   .list:first-child {
      margin-top: 320rpx;
   }
   .code {
      width: 100%;
      position: fixed;