pda-master.git - Gitblit

parent: fff90f6d | 补丁 | 提交 | ignore whitespace

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

skyouc

2025-05-07 93d3e0b9f0b25967bc46007310671934b6cb539f

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

# Conflicts:
#	pages/listing/matnrPalletising.vue

5个文件已修改

	pages/home/index.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/itemSelect.vue	215 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/matnrPalletising.vue	87 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/login/login.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/rece/other.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/home/index.vue

@@ -4,7 +4,7 @@
            <image src="../../static/img/toux.png" class="tx" mode="widthFix"></image>

            <view class="text-xl margin-top-sm margin-left-lg">

                <view class="text-blue text-bold text-xxl">

                    张经理

                    {{user.username}}

                </view>

                <view class="text-gray">仓库主管 | zy32423423</view>

            </view>

@@ -19,13 +19,13 @@
        </view>



        <view class="cu-list grid col-4 no-border">

            <view class="cu-item">

            <!-- <view class="cu-item">

                <navigator hover-class='none' url="/pages/rece/standard" navigateTo>

                    <view class="cuIcon-apps text-blue">

                    </view>

                    <text>标准收货</text>

                </navigator>

            </view>

            </view> -->



            <view class="cu-item">

                <navigator hover-class='none' url="/pages/rece/other" navigateTo>

@@ -35,18 +35,18 @@
                </navigator>

            </view>



            <view class="cu-item">

            <!-- <view class="cu-item">

                <navigator hover-class='none' url="/pages/listing/disc" navigateTo>

                    <view class="cuIcon-cardboard text-blue">

                    </view>

                    <text>组盘</text>

                </navigator>

            </view>

            </view> -->

            <view class="cu-item">

                <navigator hover-class='none' url="/pages/listing/matnrPalletising" navigateTo>

                    <view class="cuIcon-cardboard text-blue">

                    </view>

                    <text>物料组盘</text>

                    <text>单据组盘</text>

                </navigator>

            </view>



@@ -135,9 +135,14 @@
    export default {

        data() {

            return {



                user:{

					
                }

            }

        },

        onShow() {	
            this.user = uni.getStorageSync('userData');			
        },

        methods: {

            equit() {

                uni.showToast({


 pages/listing/itemSelect.vue

@@ -2,8 +2,10 @@
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
        </view>		
            <uni-search-bar v-model="condition" placeholder=" 输入批次" bgColor="#EEEEEE"  />
        </view>
		
		 
        <view>
            <view class="padding-lr margin-top-sm">
                <block v-for="(item, index) in matList" :key="index">
@@ -47,14 +49,14 @@
                                <text class="text-grey ">{{item.splrBatch}}</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>
                        </view> -->
                        <!-- <view class="cu-item">
                            <view class="content">
                                <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
@@ -87,6 +89,9 @@
                </block>
            </view>
        </view>
        <view class="cu-bar btn-group foot">			
            <button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="back">确定</button>
        </view>
        <!-- <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" /> -->
    </view>
</template>
@@ -94,29 +99,18 @@
<script>
    export default {
        data() {
            return {
                tagList: [],
            return {				
                matList: [],
                condition: '',
                reload: false,
                curr:1,
                tag: '分类',
                baColor: "background-color: #0081ff;",
                desc: '商品编号:',
                condition:'',
                baseUrl: '',
                token: '',
                status: 'more',
                contentText: {
                    contentdown: '上拉加载更多',
                    contentrefresh: '加载中',
                    contentnomore: '没有更多'
                },
                // 当前tagId
                tagIdNow: 1,
                itemStyle: {
                    border: "1px solid #e54d42",
                },
                selectedList:[]
                selectedList:[],
                repeatClick: false,
                matnrCode:'',
                asnCode:''
                
            }
        },
@@ -142,155 +136,50 @@
            
        },
        methods: {
            back() {
                for (var i = 0; i < this.matList.length; i++) {
                    if(this.matList[i].selected === true){
                        this.selectedList.push(this.matList[i])
                    }						
                }				
                this.getOpenerEventChannel().emit('backData', {data: this.selectedList});
                uni.navigateBack({
					
                })
            },
            selectedItem(index){
                
                if(this.matList[index].selected === '' || this.matList[index].selected === null || this.matList[index].selected === undefined){
                    this.matList[index].selected = true
                }else{
                    this.matList[index].selected = !this.matList[index].selected
                }				
            },
            async getDet() {
                let that = this;
                const {
                    code,
                    data,
                    msg
                } = await request('/asnOrderItem/trackCode', {
                    matnrCode: that.matnrCode,
                    asnCode: that.asnCode
                }, "post")
                if (code === 200) {
                    for (var i = 0; i < data.length; i++) {
                        data[i].receiptQty =0;
                        data[i].selected = false;							
                    }	
                    this.list = data
                } else {
                    uni.showToast({
                        title: msg,
                        icon: "none",
                        position: 'top'
                    })
                }
                console.log(this.matList[index].selected)
            },
            search() {
                let that = this
                uni.request({
                    url: that.baseUrl + '/order/search/pda/auth',
                    data: {
                        condition: that.condition
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        console.log(result);
                        var res = result.data
                        if (res.code === 200 ) {
                            that.matList = res.data
                            // that.save()
                        } else if (res.code == 403) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            showTag(parentId) {
                let that = this
                uni.request({
                    url: that.baseUrl + '/tag/list/pda/auth',
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    data: {
                        limit: 100000,
                        parentId: parentId
                    },
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        that.matList = []
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data != null && res.data.length > 0) {
                                that.tagList = res.data
                            } else {
                                that.showMat(parentId)
                            }
                            that.baColor = "background-color: #0081ff;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
                    }
                });
            },
            showMat(tagId) {
                let that = this				
                // wms端 补接口
                // @RequestMapping(value = "/mat/list/pda/page/auth")
                // @ManagerAuth
                // public R pdaPageList(@RequestParam(required = true)Long tagId,
                //                      @RequestParam(defaultValue = "1")Integer curr,
                //                      @RequestParam(defaultValue = "10")Integer limit){
                //     EntityWrapper<Mat> wrapper = new EntityWrapper<>();
                //     wrapper.eq("tag_id", tagId);
                //     wrapper.orderBy("create_time", false);
                //     return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
                // }
                uni.request({
                    url: that.baseUrl + '/order/list/pda/page/auth',
                    data: {
                        curr:that.curr,
                        limit: 100,
                        tagId: tagId
                    },
                    method:"GET",
                    header: {
                        'token':uni.getStorageSync('token'),
                    },
                    success(result) {
                        that.tagList = null
                        var res = result.data
                        if (res.code === 200) {
                            if (res.data.records != null && res.data.records.length > 0) {
                                let list = res.data.records
                                that.matList = that.reload ? list : that.matList.concat(list);
                                that.curr = that.curr + 1
                            }
                            if (res.data.records.length == 0) {
                                that.status = 'noMore'
                            }
                            that.baColor = "background-color: #1cbbb4;"
                        } else if (res.code === 403 ) {
                            uni.showToast({title: res.msg, icon: "none", position: 'top'})
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            uni.showToast({title: res.msg, icon: "none",position: 'top'})
                        }
						
                    }
                });
            },
            toPrint(item) {
                let that = this
                uni.navigateTo({
                    url: "../order/orderDetlList",
                    success: function(res) {
                        // 通过eventChannel向被打开页面传送数据   向另外一个页面传递值的
                        res.eventChannel.emit('data', {
                            data: item
                        })
                    },
                    events: {
                        // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据  另外一个页面传过来的
                        acceptDataFromOpenedPage: function(data) {
                            that.matnr = data.data
                            that.findMat(that.matnr)
                        },
                    },
				
				
                });
            }
			
        }
    }
</script>
@@ -324,5 +213,5 @@
        display: flex;
        min-height: 80upx;
        align-items: center;
    }
    }	
</style>

 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({

 pages/login/login.vue

@@ -198,9 +198,10 @@
                })

                if (code === 200) {

                    this.load.loading = true;

                    this.load.btnText = '登录中';

                    uni.setStorageSync('token', data.accessToken);

                    if (this.remberPassword) {

                    this.load.btnText = '登录中';					
                    uni.setStorageSync('token', data.accessToken);	
                    uni.setStorageSync('userData', data.user);				
                    if (this.remberPassword) {						
                        uni.setStorageSync('user', this.user);

                    } else {

                        uni.removeStorageSync('user');


 pages/rece/other.vue

@@ -61,17 +61,17 @@
                        </view>

                    </view> -->



                    <view class="cu-item">

                    <!-- <view class="cu-item">

                        <view class="content">

                            <text class="text-black">最大库存: <text class="text-grey ">{{item.maxQty}}</text></text>

                        </view>

                        <view class="content">

                            <text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>

                        </view>

                    </view>

                    </view> -->

                    <view class="cu-item">

                        <view class="content">

                            <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>

                            <text class="text-black">行号: <text class="text-grey ">{{item.platItemId}}</text></text>

                        </view>

                        <view class="content">

                            <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>

			@@ -4,7 +4,7 @@
			<image src="../../static/img/toux.png" class="tx" mode="widthFix"></image>
			<view class="text-xl margin-top-sm margin-left-lg">
			<view class="text-blue text-bold text-xxl">
			张经理
			{{user.username}}
			</view>
			<view class="text-gray">仓库主管 \| zy32423423</view>
			</view>
			@@ -19,13 +19,13 @@
			</view>

			<view class="cu-list grid col-4 no-border">
			<view class="cu-item">
			<!-- <view class="cu-item">
			<navigator hover-class='none' url="/pages/rece/standard" navigateTo>
			<view class="cuIcon-apps text-blue">
			</view>
			<text>标准收货</text>
			</navigator>
			</view>
			</view> -->

			<view class="cu-item">
			<navigator hover-class='none' url="/pages/rece/other" navigateTo>
			@@ -35,18 +35,18 @@
			</navigator>
			</view>

			<view class="cu-item">
			<!-- <view class="cu-item">
			<navigator hover-class='none' url="/pages/listing/disc" navigateTo>
			<view class="cuIcon-cardboard text-blue">
			</view>
			<text>组盘</text>
			</navigator>
			</view>
			</view> -->
			<view class="cu-item">
			<navigator hover-class='none' url="/pages/listing/matnrPalletising" navigateTo>
			<view class="cuIcon-cardboard text-blue">
			</view>
			<text>物料组盘</text>
			<text>单据组盘</text>
			</navigator>
			</view>

			@@ -135,9 +135,14 @@
			export default {
			data() {
			return {

			user:{

			}
			}
			},
			onShow() {
			this.user = uni.getStorageSync('userData');
			},
			methods: {
			equit() {
			uni.showToast({

			@@ -2,8 +2,10 @@
			<view>
			<!-- 搜索框 -->
			<view class="search-bar">
			<uni-search-bar v-model="condition" placeholder=" 扫码 / 输入" bgColor="#EEEEEE" @confirm="search" />
			</view>
			<uni-search-bar v-model="condition" placeholder=" 输入批次" bgColor="#EEEEEE" />
			</view>


			<view>
			<view class="padding-lr margin-top-sm">
			<block v-for="(item, index) in matList" :key="index">
			@@ -47,14 +49,14 @@
			<text class="text-grey ">{{item.splrBatch}}</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>
			</view> -->
			<!-- <view class="cu-item">
			<view class="content">
			<text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
			@@ -87,6 +89,9 @@
			</block>
			</view>
			</view>
			<view class="cu-bar btn-group foot">
			<button class="cu-btn bg-blue shadow-blur" :disabled="repeatClick" @click="back">确定</button>
			</view>
			<!-- <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" /> -->
			</view>
			</template>
			@@ -94,29 +99,18 @@
			<script>
			export default {
			data() {
			return {
			tagList: [],
			return {
			matList: [],
			condition: '',
			reload: false,
			curr:1,
			tag: '分类',
			baColor: "background-color: #0081ff;",
			desc: '商品编号:',
			condition:'',
			baseUrl: '',
			token: '',
			status: 'more',
			contentText: {
			contentdown: '上拉加载更多',
			contentrefresh: '加载中',
			contentnomore: '没有更多'
			},
			// 当前tagId
			tagIdNow: 1,
			itemStyle: {
			border: "1px solid #e54d42",
			},
			selectedList:[]
			selectedList:[],
			repeatClick: false,
			matnrCode:'',
			asnCode:''

			}
			},
			@@ -142,155 +136,50 @@

			},
			methods: {
			back() {
			for (var i = 0; i < this.matList.length; i++) {
			if(this.matList[i].selected === true){
			this.selectedList.push(this.matList[i])
			}
			}
			this.getOpenerEventChannel().emit('backData', {data: this.selectedList});
			uni.navigateBack({

			})
			},
			selectedItem(index){

			if(this.matList[index].selected === '' \|\| this.matList[index].selected === null \|\| this.matList[index].selected === undefined){
			this.matList[index].selected = true
			}else{
			this.matList[index].selected = !this.matList[index].selected
			}
			},
			async getDet() {
			let that = this;
			const {
			code,
			data,
			msg
			} = await request('/asnOrderItem/trackCode', {
			matnrCode: that.matnrCode,
			asnCode: that.asnCode
			}, "post")
			if (code === 200) {
			for (var i = 0; i < data.length; i++) {
			data[i].receiptQty =0;
			data[i].selected = false;
			}
			this.list = data
			} else {
			uni.showToast({
			title: msg,
			icon: "none",
			position: 'top'
			})
			}
			console.log(this.matList[index].selected)
			},
			search() {
			let that = this
			uni.request({
			url: that.baseUrl + '/order/search/pda/auth',
			data: {
			condition: that.condition
			},
			method:"GET",
			header: {
			'token':uni.getStorageSync('token'),
			},
			success(result) {
			console.log(result);
			var res = result.data
			if (res.code === 200 ) {
			that.matList = res.data
			// that.save()
			} else if (res.code == 403) {
			uni.showToast({title: res.msg, icon: "none", position: 'top'})
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			}, 1000);
			} else {
			uni.showToast({title: res.msg, icon: "none",position: 'top'})
			}
			}
			});
			},
			showTag(parentId) {
			let that = this
			uni.request({
			url: that.baseUrl + '/tag/list/pda/auth',
			header: {
			'token':uni.getStorageSync('token'),
			},
			data: {
			limit: 100000,
			parentId: parentId
			},
			header: {
			'token':uni.getStorageSync('token'),
			},
			success(result) {
			that.tagList = null
			that.matList = []
			var res = result.data
			if (res.code === 200) {
			if (res.data != null && res.data.length > 0) {
			that.tagList = res.data
			} else {
			that.showMat(parentId)
			}
			that.baColor = "background-color: #0081ff;"
			} else if (res.code === 403 ) {
			uni.showToast({title: res.msg, icon: "none", position: 'top'})
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			}, 1000);
			} else {
			uni.showToast({title: res.msg, icon: "none",position: 'top'})
			}
			}
			});
			},
			showMat(tagId) {
			let that = this
			// wms端补接口
			// @RequestMapping(value = "/mat/list/pda/page/auth")
			// @ManagerAuth
			// public R pdaPageList(@RequestParam(required = true)Long tagId,
			// @RequestParam(defaultValue = "1")Integer curr,
			// @RequestParam(defaultValue = "10")Integer limit){
			// EntityWrapper<Mat> wrapper = new EntityWrapper<>();
			// wrapper.eq("tag_id", tagId);
			// wrapper.orderBy("create_time", false);
			// return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
			// }
			uni.request({
			url: that.baseUrl + '/order/list/pda/page/auth',
			data: {
			curr:that.curr,
			limit: 100,
			tagId: tagId
			},
			method:"GET",
			header: {
			'token':uni.getStorageSync('token'),
			},
			success(result) {
			that.tagList = null
			var res = result.data
			if (res.code === 200) {
			if (res.data.records != null && res.data.records.length > 0) {
			let list = res.data.records
			that.matList = that.reload ? list : that.matList.concat(list);
			that.curr = that.curr + 1
			}
			if (res.data.records.length == 0) {
			that.status = 'noMore'
			}
			that.baColor = "background-color: #1cbbb4;"
			} else if (res.code === 403 ) {
			uni.showToast({title: res.msg, icon: "none", position: 'top'})
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			}, 1000);
			} else {
			uni.showToast({title: res.msg, icon: "none",position: 'top'})
			}

			}
			});
			},
			toPrint(item) {
			let that = this
			uni.navigateTo({
			url: "../order/orderDetlList",
			success: function(res) {
			// 通过eventChannel向被打开页面传送数据向另外一个页面传递值的
			res.eventChannel.emit('data', {
			data: item
			})
			},
			events: {
			// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据另外一个页面传过来的
			acceptDataFromOpenedPage: function(data) {
			that.matnr = data.data
			that.findMat(that.matnr)
			},
			},


			});
			}

			}
			}
			</script>
			@@ -324,5 +213,5 @@
			display: flex;
			min-height: 80upx;
			align-items: center;
			}
			}
			</style>

			@@ -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({

			@@ -198,9 +198,10 @@
			})
			if (code === 200) {
			this.load.loading = true;
			this.load.btnText = '登录中';
			uni.setStorageSync('token', data.accessToken);
			if (this.remberPassword) {
			this.load.btnText = '登录中';
			uni.setStorageSync('token', data.accessToken);
			uni.setStorageSync('userData', data.user);
			if (this.remberPassword) {
			uni.setStorageSync('user', this.user);
			} else {
			uni.removeStorageSync('user');

			@@ -61,17 +61,17 @@
			</view>
			</view> -->

			<view class="cu-item">
			<!-- <view class="cu-item">
			<view class="content">
			<text class="text-black">最大库存: <text class="text-grey ">{{item.maxQty}}</text></text>
			</view>
			<view class="content">
			<text class="text-black">实时库存: <text class="text-grey ">{{item.stockQty}}</text></text>
			</view>
			</view>
			</view> -->
			<view class="cu-item">
			<view class="content">
			<text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
			<text class="text-black">行号: <text class="text-grey ">{{item.platItemId}}</text></text>
			</view>
			<view class="content">
			<text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>