Merge branch 'devlop' of http://47.97.1.152:5880/r/pda-master into devlop

skyouc

2025-05-07 93d3e0b9f0b25967bc46007310671934b6cb539f

 pages/listing/matnrPalletising.vue

@@ -54,10 +54,10 @@
               </view>
               <view class="cu-item">
                  <view class="content">
                     <text class="text-black">物料编码:</text>
                     <text class="text-black">物料条码:</text>
                  </view>
                  <view class="action">
                     <text class="text-grey ">{{item.matnrCode}}</text>
                     <text class="text-grey ">{{item.trackCode}}</text>
                  </view>
               </view>
               <view class="cu-item">
@@ -67,24 +67,15 @@
                  <view class="action">
                     <text class="text-grey ">{{item.splrBatch}}</text>
                  </view>
                  <view class="content">
                     <text class="text-black">质检状态:</text>
                  </view>
                  <view class="action">
                     <text class="text-grey ">{{item.isptResult$}}</text>
                  </view>
               </view>
               <view class="cu-item">
               <!-- <view class="cu-item">
                  <view class="content">
                     <text class="text-black">库存批次:</text>
                  </view>
                  <view class="action">
                     <text class="text-grey ">{{item.batch}}</text>
                  </view>
                  <view class="content">
                     <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
                  </view>
               </view>
               </view> -->
               <!-- <view class="cu-item">
                  <view class="content">
                     <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -95,7 +86,9 @@
               </view> -->

               <view class="cu-item">
		
                  <view class="content">
                     <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
                  </view>
                  <view class="content">
                     <text class="text-black">收货数量: <text class="text-grey ">{{item.anfme}}</text></text>
                  </view>
@@ -171,41 +164,46 @@

         },
         async getDet() {
            let that = this;
            const {
               code,
               data,
               msg
            } = await request('/asnOrderItem/trackCode', {
               matnrCode: this.matnrCode,
               asnCode: this.asnCode
               matnrCode: that.matnrCode,
               asnCode: that.asnCode
            }, "post")
            if (code === 200) {
               // if(data !== [] || data !== null){					
               // uni.navigateTo({
               //       url: "../listing/itemSelect",
               //       success: function(res) {
               //          // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
               //          res.eventChannel.emit('data', {
               //             item: data
               //          })
               //       },
               //       events: {
               //          // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
               //          acceptDataFromOpenedPage: function(data) {
               //             that.matnr = data.data
               //             that.findMat(that.matnr)
               //          },
               //       },
						
						
               //    });
						
               data.map(item => {
                  item.receiptQty = 0;
                  item.selected = false;
               })
               // for (var i = 0; i < data.length; i++) {
               //    data[i].receiptQty =1;
               //    data[i].selected = false;							
               // }
               for (var i = 0; i < data.length; i++) {
                  data[i].receiptQty =1;
                  data[i].selected = false;							
               }	
               this.list = data
               if(data !== [] || data !== null){					
               uni.navigateTo({
                     url: "../listing/itemSelect",
                     success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                           item: data
                        })
                     },
                     events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        backData: function(data) {									
                           that.showBackData(data.data)
                        },
                     },
						
						
                  });
						
               }
						
               // this.list = data
            } else {
               uni.showToast({
                  title: msg,
@@ -232,6 +230,13 @@
               })
            }
         },
         showBackData(data){
            this.list = data.map(item => {					
               return {
                  ...item												
               };
            });
         },
         scrollTo() {
            const ref = this.$refs[`${this.barcode}ref`][0];
            uni.pageScrollTo({