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

zjj

2023-11-02 0e9b215cbc05b20d4f9a677b4c9623388ba7f3f7

 pages/order/orderPutDown.vue

@@ -1,23 +1,16 @@
<template>
   <view>
      <view class="code">
         <!-- <view class="item">
            <view class="code-decs">订单号:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="order" :focus="orderFocus"
               @input="orderInput()" disabled>
         </view> -->
         <view class="item">
            <view class="code-decs">托盘码:</view>
            <view class="code-decs">库位码:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
               @confirm="barcodeInput()">
               @input="barcodeInput()">
         </view>
         <view class="item">
            <view class="code-decs">库位号:</view>
            <view class="code-decs">物料号:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
            <view class="item-right">
               <button></button>
               <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">提取+</text> -->
               <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
            </view>
         </view>
      </view>
@@ -58,6 +51,12 @@
                  </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>
               </view>
@@ -71,7 +70,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>
      <!-- 弹窗 -->
      <!-- 修改数量 -->
@@ -87,14 +86,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 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">
@@ -118,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"
@@ -148,7 +151,6 @@
            baseUrl: '',
            token: '',
            order: '',
            orderFocus: true,
            barcode: '',
            barcodeFocus: '',
            dataList: [],
@@ -157,14 +159,16 @@
            matnr: '',
            matnr1: '',
            batch: '',
            weight: '',
            msgType1: 'success',
            msgType: 'success',
            messageText: '',
            title: '',
            content: '',
            barcodeFocus: false,
            barcodeFocus: true,
            matFocus: false,
            matData: ''
            matData: '',
            removeNum: 0
         }
      },
      onShow() {
@@ -175,6 +179,28 @@
         messageToggle(type) {
            this.msgType1 = type
            this.$refs.message.open()
         },
         barcodeInput() {
            // 不设置定时器 会出现扫入的字符串不全
            setTimeout(() => {
               this.focuss()
            }, 200)
         },
         // 托盘码有误重置
         barcodeFocuss() {
            let that = this;
            that.barcodeFocus = false;
            setTimeout(() => {
               that.barcode = '';
               that.barcodeFocus = true;
            }, 100);
         },
         // 商品光标清空重置
         focuss() {
            setTimeout(() => {
               this.matnr = '';
               this.matFocus = true;
            }, 100);
         },
         // 搜索物料
         findMat() {
@@ -209,6 +235,7 @@
                        events: {
                           matList: function(data) {
                              that.checkMat(data.data)
                              that.focuss()
                           },
                        },
                     });
@@ -276,7 +303,7 @@
         combConfirm(type) {
            this.msgType = type
            this.title = '警告'
            this.content = '是否现在组托!'
            this.content = '是否现在下架!'
            this.$refs.combConfirm.open()
         },
         comb() {
@@ -294,15 +321,15 @@
            }
            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;
               }
            }
            uni.request({
               url: that.baseUrl + '/mobile/comb/auth',
               url: that.baseUrl + '/mobile/manDetl/out',
               data: JSON.stringify({
                  locno: that.barcode,
                  locNo: that.barcode,
                  combMats: that.dataList
               }),
               method: 'POST',
@@ -313,7 +340,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
@@ -353,6 +380,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()
         },
@@ -362,6 +390,7 @@
         },
         // 列表移除按钮
         remove(item, i, type) {
            this.removeNum  = i
            this.msgType = type
            this.title = '警告'
            this.content = '是否移除当前商品!'
@@ -371,11 +400,12 @@
         removeConfirm(i) {
            this.messageText = "移除成功"
            this.messageToggle('success')
            this.dataList.splice(i, 1)
            this.dataList.splice(this.removeNum, 1)
         },
         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()
@@ -393,6 +423,13 @@
            this.barcode = ''
            this.barcodeFocuss()
         },
         combClose() {
            this.$refs.combConfirm.close()
         },
         // 取消移除
         removeClose() {
            this.$refs.alertDialog.close()
         },
      }
   }
</script>