Merge remote-tracking branch 'origin/mtmmwms' into mtmmwms

zjj

2023-11-02 0e9b215cbc05b20d4f9a677b4c9623388ba7f3f7

 pages/order/orderPutOn.vue

@@ -121,7 +121,7 @@
            <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
         </uni-popup>
      </view>
      <!-- 确认组托 -->
      <!-- 确认上架 -->
      <view>
         <uni-popup ref="combConfirm" type="dialog">
            <uni-popup-dialog :type="msgType" cancelText="取消" confirmText="确认" :title="title" :content="content"
@@ -144,9 +144,9 @@
      <view>
         <!-- 普通弹窗 -->
         <uni-popup ref="popup" background-color="#fff">
            <view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
            <scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
               <view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
            </view>
            </scroll-view>
         </uni-popup>
      </view>
   </view>
@@ -289,8 +289,10 @@
               data: {matnr: that.matnr},
               header: {'token': uni.getStorageSync('token')},
               success(res) {
                  res = res.data.data
                  that.recommendLocs = res
                  res = res.data
                  if (res.code == 200 && res.data) {
                     that.recommendLocs = res.data
                  } 
               }
               
            })
@@ -336,14 +338,14 @@
         combConfirm(type) {
            this.msgType = type
            this.title = '警告'
            this.content = '是否现在组托!'
            this.content = '是否现在上架!'
            this.$refs.combConfirm.open()
         },
         comb() {
            uni.vibrateShort();
            let that = this;
            if (that.barcode === '') {
               this.messageText = "请扫描托盘条码"
               this.messageText = "请添加库位码"
               this.messageToggle('error')
               return;
            }
@@ -354,7 +356,7 @@
            }
            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.messageText = that.dataList[i].matnr + '上架数量不能为0'
                  this.messageToggle('error')
                  return;
               }
@@ -373,7 +375,7 @@
                  var res = result.data
                  if (res.code === 200) {
                     that.resst();
                     that.messageText = "组托成功"
                     that.messageText = "上架成功"
                     that.messageToggle('success')
                  } else if (res.code == 403) {
                     that.messageText = res.msg
@@ -454,6 +456,7 @@
         resst() {
            this.dataList = []
            this.barcode = ''
            this.recommendLocs = []
            this.barcodeFocuss()
         },
         combClose() {
@@ -470,6 +473,8 @@
<style>
   @import url('../../static/css/wms.css/wms.css');
   .popup-content {
      /* height: 90vh; */
      height: 90vh;
      width: 200px;
   }
   .recommend {