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

whycq

2024-11-19 fe8fb74ce94e7bee23ed47b7175236248ac93b98

 pages/order/orderPutOn.vue

@@ -2,16 +2,16 @@
   <view>
      <view class="code">
         <view class="item">
            <view class="code-decs">库位号:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus"
               @input="barcodeInput()">
         </view>
         <view class="item">
            <view class="code-decs">物料号:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="matnr" :focus="matFocus" @input="findMat()">
            <view class="item-right">
               <button></button>
            </view>
         </view>
         <view class="item">
            <view class="code-decs">库位号:</view>
            <input type="text" placeholder=" 扫码 / 输入" v-model="barcode" :focus="barcodeFocus">
               <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">推荐</button>
         </view>
      </view>
      <view class="mat-list-title">
@@ -141,6 +141,14 @@
            <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
         </uni-popup>
      </view>
      <view>
         <!-- 普通弹窗 -->
         <uni-popup ref="popup" background-color="#fff">
            <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>
            </scroll-view>
         </uni-popup>
      </view>
   </view>
</template>

@@ -165,10 +173,12 @@
            messageText: '',
            title: '',
            content: '',
            barcodeFocus: true,
            matFocus: false,
            barcodeFocus: false,
            matFocus: true,
            matData: '',
            removeNum: 0
            removeNum: 0,
            type: 'center',
            recommendLocs: []
         }
      },
      onShow() {
@@ -212,12 +222,8 @@
            that.matnr = matnr[1]
            uni.request({
               url: that.baseUrl + '/mat/auth',
               data: {
                  matnr: that.matnr
               },
               header: {
                  'token': uni.getStorageSync('token')
               },
               data: { matnr: that.matnr },
               header: { 'token': uni.getStorageSync('token') },
               success(result) {
                  result = result.data
                  if (result.code === 200 && result.data) {
@@ -236,33 +242,41 @@
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
                        events: {
                           matList: function(data) {
                              that.recommendLoc()
                              that.checkMat(data.data)
                              that.focuss()
                           },
                        },
                     });
                  } 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'
                        });
                        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' })
                  }
         
               }
            });
         
         },
         // 推荐库位
         recommendLoc() {
            let that = this
            that.recommendLocs = []
            uni.request({
               url: that.baseUrl + '/node/recommendLoc',
               data: {matnr: that.matnr},
               header: {'token': uni.getStorageSync('token')},
               success(res) {
                  res = res.data
                  if (res.code == 200 && res.data) {
                     that.recommendLocs = res.data
                  } 
               }
					
            })
         },
         checkMat(mat) {
            mat['orderNo'] = this.order
@@ -312,19 +326,16 @@
            uni.vibrateShort();
            let that = this;
            if (that.barcode === '') {
               this.messageText = "请扫描托盘条码"
               this.messageToggle('error')
               uni.showToast({ title:"请扫描托盘条码", icon: "error", position: 'center' })
               return;
            }
            if (that.dataList.length === 0) {
               this.messageText = "请添加商品列表"
               this.messageToggle('error')
               uni.showToast({ title:"请添加商品列表", icon: "error", position: 'center' })
               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: 'center' })
                  return;
               }
            }
@@ -335,26 +346,21 @@
                  combMats: that.dataList
               }),
               method: 'POST',
               header: {
                  'token': uni.getStorageSync('token')
               },
               header: { 'token': uni.getStorageSync('token') },
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
                     that.resst();
                     that.messageText = "组托成功"
                     that.messageToggle('success')
                     uni.showToast({ title:"组托成功", icon: "success", position: 'center' })
                  } else if (res.code == 403) {
                     that.messageText = res.msg
                     that.messageToggle('error')
                     uni.showToast({ title: res.msg, icon: "none", position: 'top' })
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                  } else {
                     that.messageText = res.msg
                     that.messageToggle('error')
                     uni.showToast({ title: res.msg, icon: "none", position: 'top' })
                  }
               }
            });
@@ -400,16 +406,14 @@
         },
         // 确认移除
         removeConfirm(i) {
            this.messageText = "移除成功"
            this.messageToggle('success')
            uni.showToast({ title: "移除成功", icon: "success", position: 'top' })
            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')
            uni.showToast({ title: "修改成功", icon: "success", position: 'top' })
            this.$refs.revise.close()
            this.$forceUpdate() // 强制刷新
         },