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

skyouc

2025-05-08 b6c44345b43433a9e28aab4fc33dedfb5ab16efe

 pages/listing/matnrPalletising.vue

@@ -51,15 +51,7 @@
                  <view class="action">
                     <text class="text-grey ">{{item.asnCode}}</text>
                  </view>
               </view>
               <view class="cu-item">
                  <view class="content">
                     <text class="text-black">物料条码:</text>
                  </view>
                  <view class="action">
                     <text class="text-grey ">{{item.trackCode}}</text>
                  </view>
               </view>
               </view>					
               <view class="cu-item">
                  <view class="content">
                     <text class="text-black">供应商批次:</text>
@@ -163,56 +155,85 @@
            find ? this.scrollTo() : this.getDet();

         },
         async getDet() {
         getDet() {
            let that = this;
            const {
               code,
               data,
               msg
            } = await request('/asnOrderItem/trackCode', {
               matnrCode: that.matnrCode,
               asnCode: that.asnCode
            }, "post")
            if (code === 200) {
               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;							
               // }
               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)
                        },
                     },
            uni.navigateTo({
               url: "../listing/itemSelect",
               success: function(res) {
                  // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                  res.eventChannel.emit('data', {
                     matnrCode: that.matnrCode,
                     asnCode: that.asnCode
                  })
               },
               events: {
                  // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                  backData: function(data) {									
                     that.showBackData(data.data)
                  },
               },
				
				
            });
         },
         // async getDet() {
         //    let that = this;
         //    const {
         //       code,
         //       data,
         //       msg
         //    } = await request('/asnOrderItem/trackCode', {
         //       matnrCode: that.matnrCode,
         //       asnCode: that.asnCode
         //    }, "post")
         //    if (code === 200) {
         //       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;							
         //       // }
         //       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 {
         //       // this.list = data
         //    } else {
         //       uni.showToast({
         //          title: msg,
         //          icon: "none",
         //          position: 'top'
         //       })
         //    }
         // },
         async getList() {
            if(this.barcode === '' || this.barcode === null){
               uni.showToast({
                  title: msg,
                  title: "容器码为空",
                  icon: "none",
                  position: 'top'
               })
               return ;
            }
         },
         async getList() {
            const {
               code,
               data,
@@ -230,12 +251,16 @@
               })
            }
         },
         showBackData(data){
            this.list = data.map(item => {					
               return {
                  ...item												
               };
            });
         showBackData(data){	
            data.map(item => {					
               this.list.push(item)
            })				
            this.list = this.list.filter((item, index, self) =>
               self.findIndex(i => (
                  i.id === item.id // 根据id去重
               )) === index
            );
								
         },
         scrollTo() {
            const ref = this.$refs[`${this.barcode}ref`][0];