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

whycq

2024-05-25 40ba4c8f015f9d1d259357990b163a64587eb6fd

 pages/order/orderPakin.vue

@@ -15,6 +15,17 @@
               <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
            </view>
         </view>
         <view class="item">
            <view class="code-decs">满托:</view>
            <radio-group @change="floor">
               <label>
                  <radio :checked="ck1"/><text>是</text>
               </label>
               <label>
                  <radio :checked="ck2" style="margin-left: 50rpx;"/><text>否</text>
               </label>
            </radio-group>
         </view>
      </view>
      <view class="mat-list-title">
         商品列表
@@ -52,6 +63,12 @@
                     <uni-tag :text="item.batch" type="warning"></uni-tag>
                  </view>
               </view>
               <!-- <view class="list-left-item">
                  <view class="desc">重量：</view>
                  <view class="left-item">
                     <uni-tag :text="item.weight" type="warning"></uni-tag>
                  </view>
               </view> -->
               <view class="list-left-item">
                  <view class="desc">数量：</view>
                  <view class="left-item">{{item.anfme}}</view>
@@ -66,7 +83,7 @@
      <!-- 底部操作按钮 -->
      <view class="buttom">
         <button size="mini" @click="reset('warn')">重置</button>
         <button size="mini" type="primary" @click="combConfirm('warn')">组托</button>
         <button size="mini" type="primary" @click="combConfirm('warn')">入库</button>
      </view>
      <!-- 弹窗 -->
      <!-- 修改数量 -->
@@ -82,14 +99,18 @@
                        style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
                  </view>
               </view>
               <view class="popup-item">
               <!-- <view class="popup-item">
                  <view class="popup-item-left">批号:</view>
                  <view class="popup-item-right"><input type="text" v-model="batch"></view>
               </view>
               </view> -->
               <!-- <view class="popup-item">
                  <view class="popup-item-left">重量:</view>
                  <view class="popup-item-right"><input type="text" v-model="weight"></view>
               </view> -->
               <view class="popup-item">
                  <view class="popup-item-left">数量:</view>
                  <view class="popup-item-right" style="border: none;justify-content: center;">
                     <uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
                     <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
                  </view>
               </view>
               <view class="btn">
@@ -113,7 +134,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"
@@ -150,6 +171,7 @@
            matnr: '',
            matnr1: '',
            batch: '',
            weight: '',
            msgType1: 'success',
            msgType: 'success',
            messageText: '',
@@ -158,7 +180,10 @@
            barcodeFocus: true,
            matFocus: false,
            matData: '',
            removeNum: 0
            removeNum: 0,
            ck1: true,
            ck2: false,
            isFull: true
         }
      },
      onShow() {
@@ -166,6 +191,12 @@
         this.token = uni.getStorageSync('token');
      },
      methods: {
         floor() {
            var temp = this.ck1
            this.ck1 = this.ck2
            this.ck2 = temp
            this.isFull = !temp
         },
         messageToggle(type) {
            this.msgType1 = type
            this.$refs.message.open()
@@ -273,7 +304,7 @@
         combConfirm(type) {
            this.msgType = type
            this.title = '警告'
            this.content = '是否现在组托!'
            this.content = '是否现在入库!'
            this.$refs.combConfirm.open()
         },
         comb() {
@@ -291,7 +322,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;
               }
@@ -300,6 +331,7 @@
               url: that.baseUrl + '/mobile/comb/auth',
               data: JSON.stringify({
                  barcode: that.barcode,
                  isFull: that.isFull,
                  combMats: that.dataList
               }),
               method: 'POST',
@@ -310,7 +342,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
@@ -351,6 +383,7 @@
            this.matnr1 = this.dataList[i].matnr
            this.count = this.dataList[i].anfme
            this.batch = this.dataList[i].batch
            this.weight = this.dataList[i].weight
            this.rowNum = i
            this.eject()
         },
@@ -375,6 +408,7 @@
         reviseConfirm() {
            this.dataList[this.rowNum].anfme = this.count
            this.dataList[this.rowNum].batch = this.batch
            this.dataList[this.rowNum].weight = this.weight
            this.messageText = "修改成功"
            this.messageToggle('success')
            this.$refs.revise.close()
@@ -391,6 +425,13 @@
            this.dataList = []
            this.barcode = ''
            this.barcodeFocuss()
         },
         combClose() {
            this.$refs.combConfirm.close()
         },
         // 取消移除
         removeClose() {
            this.$refs.alertDialog.close()
         },
      }
   }
@@ -415,14 +456,14 @@
   .code {
      width: 100%;
      position: fixed;
      min-height: 200rpx;
      min-height: 210rpx;
      background-color: #FFF;
      z-index: 10;
   }
   .item {
      display: flex;
      align-items: center;
      height: 100rpx;
      height: 70rpx;
      margin-left: 20rpx;
      border-bottom: 1px solid #DCDFE6;
   }