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

野心家

2025-01-06 a374e91194afc8d3c2be316c0e4fdbf55e5cd429

 pages/order/orderPutOn.vue

@@ -222,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) {
@@ -253,22 +249,12 @@
                        },
                     });
                  } 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' })
                  }
         
               }
@@ -340,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;
               }
            }
@@ -363,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' })
                  }
               }
            });
@@ -428,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() // 强制刷新
         },