pda-master.git - Gitblit

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

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

skyouc

2025-05-08 b6c44345b43433a9e28aab4fc33dedfb5ab16efe

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

3个文件已修改

	pages/listing/itemSelect.vue	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/listing/matnrPalletising.vue	135 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/rece/other.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/listing/itemSelect.vue

@@ -2,7 +2,7 @@
    <view>
        <!-- 搜索框 -->
        <view class="search-bar">
            <uni-search-bar v-model="condition" placeholder=" 输入批次" bgColor="#EEEEEE"  />
            <uni-search-bar v-model="condition" placeholder=" 输入批次" bgColor="#EEEEEE"  @confirm="search()"/>
        </view>
        
         
@@ -33,14 +33,7 @@
                                <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 class="cu-item">
                            <view class="content">
                                <text class="text-black">供应商批次:</text>
@@ -49,23 +42,6 @@
                                <text class="text-grey ">{{item.splrBatch}}</text>
                            </view>
                        </view>
                        <!-- <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 class="cu-item">
                            <view class="content">
                                <text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
                            </view>
                            <view class="content">
                                <text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>
                            </view>
                        </view> -->
			
                        <view class="cu-item">
                            <view class="content">
                                <text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
@@ -97,6 +73,9 @@
</template>

<script>
    import {
        request
    } from '../../common/request.js'
    export default {
        data() {
            return {                
@@ -110,7 +89,7 @@
                selectedList:[],
                repeatClick: false,
                matnrCode:'',
                asnCode:''
                asnCode:'',				
                
            }
        },
@@ -126,8 +105,7 @@
            
            // 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
            eventChannel.on('data', function(data) {
                console.log(data.item)
                that.matList = data.item
                that.getDet(data)
            })
        },
        onShow() {
@@ -136,6 +114,15 @@
            
        },
        methods: {
            search(){
                let req = {
                    matnrCode: this.condition,
                    asnCode: this.condition,
                    code: this.condition,
                    batch: this.condition
                }
                this.getDet(req);
            },
            back() {
                for (var i = 0; i < this.matList.length; i++) {
                    if(this.matList[i].selected === true){
@@ -155,22 +142,27 @@
                    this.matList[index].selected = !this.matList[index].selected
                }                
            },
            async getDet() {
            async getDet(req) {
                let that = this;
                uni.showLoading({
                    title:'加载中...'
                })
                const {
                    code,
                    data,
                    msg
                } = await request('/asnOrderItem/trackCode', {
                    matnrCode: that.matnrCode,
                    asnCode: that.asnCode
                    matnrCode: req.matnrCode,
                    asnCode: req.asnCode,
                    code: req.code,
                    batch: req.batch
                }, "post")
                if (code === 200) {
                    for (var i = 0; i < data.length; i++) {
                        data[i].receiptQty =0;
                        data[i].selected = false;                            
                    }    
                    this.list = data
                    this.matList = data
                } else {
                    uni.showToast({
                        title: msg,
@@ -178,6 +170,7 @@
                        position: 'top'
                    })
                }
                uni.hideLoading();
            },
            
        }

 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];

 pages/rece/other.vue

@@ -111,7 +111,7 @@
                        <view class="content" v-if="!isconfirm">

                            <view class="cu-form-group padding-lr-0">

                                <view class="title text-blue">供应商批次:</view>

                                <input placeholder="请输入供应商批次" v-model="item.splrBatch"></input>

                                {{item.splrBatch}}

                            </view>

                        </view>

                        <view class="content" v-else>

@@ -159,10 +159,10 @@


        <view class="cu-form-group margin-bottom">

            <view class="title">收货区</view>

            <view>

                <uni-data-select v-model="whAreaId" :localdata="range" placement="top"

            <view style="width: 80%;">

                <uni-data-select style="min-width: 90%; max-width: 90%;" v-model="whAreaId" :localdata="range" placement="top"

                    @change="selChange"></uni-data-select>

            </view>>

            </view>

        </view>



        <view class="cu-bar btn-group foot" v-show="!isconfirm">

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


			@@ -33,14 +33,7 @@
			<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 class="cu-item">
			<view class="content">
			<text class="text-black">供应商批次:</text>
			@@ -49,23 +42,6 @@
			<text class="text-grey ">{{item.splrBatch}}</text>
			</view>
			</view>
			<!-- <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 class="cu-item">
			<view class="content">
			<text class="text-black">平台行号: <text class="text-grey ">{{item.platformId}}</text></text>
			</view>
			<view class="content">
			<text class="text-black">质检结果: <text class="text-grey ">{{item.inspect}}</text></text>
			</view>
			</view> -->

			<view class="cu-item">
			<view class="content">
			<text class="text-black">库存单位: <text class="text-grey ">{{item.stockUnit}}</text></text>
			@@ -97,6 +73,9 @@
			</template>

			<script>
			import {
			request
			} from '../../common/request.js'
			export default {
			data() {
			return {
			@@ -110,7 +89,7 @@
			selectedList:[],
			repeatClick: false,
			matnrCode:'',
			asnCode:''
			asnCode:'',

			}
			},
			@@ -126,8 +105,7 @@

			// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
			eventChannel.on('data', function(data) {
			console.log(data.item)
			that.matList = data.item
			that.getDet(data)
			})
			},
			onShow() {
			@@ -136,6 +114,15 @@

			},
			methods: {
			search(){
			let req = {
			matnrCode: this.condition,
			asnCode: this.condition,
			code: this.condition,
			batch: this.condition
			}
			this.getDet(req);
			},
			back() {
			for (var i = 0; i < this.matList.length; i++) {
			if(this.matList[i].selected === true){
			@@ -155,22 +142,27 @@
			this.matList[index].selected = !this.matList[index].selected
			}
			},
			async getDet() {
			async getDet(req) {
			let that = this;
			uni.showLoading({
			title:'加载中...'
			})
			const {
			code,
			data,
			msg
			} = await request('/asnOrderItem/trackCode', {
			matnrCode: that.matnrCode,
			asnCode: that.asnCode
			matnrCode: req.matnrCode,
			asnCode: req.asnCode,
			code: req.code,
			batch: req.batch
			}, "post")
			if (code === 200) {
			for (var i = 0; i < data.length; i++) {
			data[i].receiptQty =0;
			data[i].selected = false;
			}
			this.list = data
			this.matList = data
			} else {
			uni.showToast({
			title: msg,
			@@ -178,6 +170,7 @@
			position: 'top'
			})
			}
			uni.hideLoading();
			},

			}

			@@ -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];

			@@ -111,7 +111,7 @@
			<view class="content" v-if="!isconfirm">
			<view class="cu-form-group padding-lr-0">
			<view class="title text-blue">供应商批次:</view>
			<input placeholder="请输入供应商批次" v-model="item.splrBatch"></input>
			{{item.splrBatch}}
			</view>
			</view>
			<view class="content" v-else>
			@@ -159,10 +159,10 @@

			<view class="cu-form-group margin-bottom">
			<view class="title">收货区</view>
			<view>
			<uni-data-select v-model="whAreaId" :localdata="range" placement="top"
			<view style="width: 80%;">
			<uni-data-select style="min-width: 90%; max-width: 90%;" v-model="whAreaId" :localdata="range" placement="top"
			@change="selChange"></uni-data-select>
			</view>>
			</view>
			</view>

			<view class="cu-bar btn-group foot" v-show="!isconfirm">