wms_app.git - Gitblit

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

whycq

2024-07-25 597fc3077ad5acdde2e8dd5ef41f502ce7558445

4个文件已修改

	pages/order/orderComb.vue	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/orderDetlList.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/orderPutOn.vue	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/pakin/WarehouseIn.vue	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/order/orderComb.vue

@@ -394,19 +394,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;
                    }
                }
@@ -425,19 +422,16 @@
                        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: "error", position: 'center' })
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                            }, 1000);
                        } else {
                            that.messageText = res.msg
                            that.messageToggle('error')
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                });
@@ -453,8 +447,7 @@
                this.dataList = []
                this.orderNo = ''
                this.barcode = ''
                this.messageText = "重置完成"
                this.messageToggle('success')
                uni.showToast({ title:"重置完成", icon: "success", position: 'center' })
            },
            // 取消重置
            resetClose() {
@@ -483,16 +476,14 @@
            },
            // 确认移除
            removeConfirm(i) {
                this.messageText = "移除成功"
                this.messageToggle('success')
                uni.showToast({ title:"移除成功", icon: "success", position: 'center' })
                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: 'center' })
                this.$refs.revise.close()
                this.$forceUpdate() // 强制刷新
            },

 pages/order/orderDetlList.vue

@@ -40,12 +40,8 @@
                let that = this
                uni.request({
                    url: this.baseUrl + '/orderDetl/forOrderNo/auth',
                    data: {
                        orderNo: that.orderNo
                    },
                    header: {
                        'token': uni.getStorageSync('token')
                    },					
                    data: { orderNo: that.orderNo },
                    header: { 'token': uni.getStorageSync('token') },					
                    success(res) {
                        res = res.data
                        that.menuList = res.data

 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() // 强制刷新
            },

 pages/pakin/WarehouseIn.vue

@@ -206,27 +206,19 @@
                    }
                    uni.request({
                        url: that.baseUrl + '/waitPakin/forBarcode/auth',
                        data: {
                            barcode: that.barcode							
                        },						
                        header: {
                            'token': uni.getStorageSync('token')
                        },
                        data: { barcode: that.barcode },						
                        header: { 'token': uni.getStorageSync('token') },
                        success(result) {
                            var res = result.data
                            if (res.code === 200) {
                                that.dataList = res.data;
                            } else if (res.code == 403) {
                                that.messageText = res.msg
                                that.messageToggle('error')
                                uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                                setTimeout(() => {
                                    uni.reLaunch({
                                        url: '../login/login'
                                    });
                                    uni.reLaunch({ url: '../login/login' });
                                }, 1000);
                            } else {
                                that.messageText = res.msg
                                that.messageToggle('error')
                                uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                            }
                        }
                    });
@@ -382,8 +374,7 @@
            },
            // 确认移除
            removeConfirm() {
                this.messageText = "移除成功"
                this.messageToggle('success')
                uni.showToast({ title: "移除成功", icon: "success", position: 'center' })
                this.dataList.splice(this.removeNum, 1)
            },
            // 取消移除
@@ -395,8 +386,7 @@
                this.dataList[this.rowNum].batch = this.batch
                this.dataList[this.rowNum].weight = this.weight
                this.matnr = ''
                this.messageText = "修改成功"
                this.messageToggle('success')
                uni.showToast({ title: "修改成功", icon: "success", position: 'center' })
                this.$refs.revise.close()
            },
            reviseClose() {
@@ -419,8 +409,7 @@
                let that = this;
                
                if (that.dataList.length === 0) {
                    this.messageText = "托盘码组托数据有误"
                    this.messageToggle('error')
                    uni.showToast({ title: "托盘码组托数据有误", icon: "error", position: 'center' })
                    return;
                }                
                uni.request({
@@ -429,26 +418,19 @@
                        barcode: that.barcode,
                        locNo: that.locNo
                    },                    
                    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: "error", position: 'center' })
                            setTimeout(() => {
                                uni.reLaunch({
                                    url: '../login/login'
                                });
                                uni.reLaunch({ url: '../login/login' });
                            }, 1000);
                        } else {
                            that.messageText = res.msg
                            that.messageToggle('error')
                            uni.showToast({ title: res.msg, icon: "error", position: 'center' })
                        }
                    }
                });
@@ -462,8 +444,7 @@
            // 确认重置
            resetConfirm() {
                this.dataList = []
                this.messageText = "重置完成"
                this.messageToggle('success')
                uni.showToast({ title: "重置完成", icon: "success", position: 'center' })
            },
            // 取消重置
            resetClose() {

			@@ -394,19 +394,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;
			}
			}
			@@ -425,19 +422,16 @@
			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: "error", position: 'center' })
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			}, 1000);
			} else {
			that.messageText = res.msg
			that.messageToggle('error')
			uni.showToast({ title: res.msg, icon: "error", position: 'center' })
			}
			}
			});
			@@ -453,8 +447,7 @@
			this.dataList = []
			this.orderNo = ''
			this.barcode = ''
			this.messageText = "重置完成"
			this.messageToggle('success')
			uni.showToast({ title:"重置完成", icon: "success", position: 'center' })
			},
			// 取消重置
			resetClose() {
			@@ -483,16 +476,14 @@
			},
			// 确认移除
			removeConfirm(i) {
			this.messageText = "移除成功"
			this.messageToggle('success')
			uni.showToast({ title:"移除成功", icon: "success", position: 'center' })
			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: 'center' })
			this.$refs.revise.close()
			this.$forceUpdate() // 强制刷新
			},

			@@ -40,12 +40,8 @@
			let that = this
			uni.request({
			url: this.baseUrl + '/orderDetl/forOrderNo/auth',
			data: {
			orderNo: that.orderNo
			},
			header: {
			'token': uni.getStorageSync('token')
			},
			data: { orderNo: that.orderNo },
			header: { 'token': uni.getStorageSync('token') },
			success(res) {
			res = res.data
			that.menuList = res.data

			@@ -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() // 强制刷新
			},

			@@ -206,27 +206,19 @@
			}
			uni.request({
			url: that.baseUrl + '/waitPakin/forBarcode/auth',
			data: {
			barcode: that.barcode
			},
			header: {
			'token': uni.getStorageSync('token')
			},
			data: { barcode: that.barcode },
			header: { 'token': uni.getStorageSync('token') },
			success(result) {
			var res = result.data
			if (res.code === 200) {
			that.dataList = res.data;
			} else if (res.code == 403) {
			that.messageText = res.msg
			that.messageToggle('error')
			uni.showToast({ title: res.msg, icon: "error", position: 'center' })
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			uni.reLaunch({ url: '../login/login' });
			}, 1000);
			} else {
			that.messageText = res.msg
			that.messageToggle('error')
			uni.showToast({ title: res.msg, icon: "error", position: 'center' })
			}
			}
			});
			@@ -382,8 +374,7 @@
			},
			// 确认移除
			removeConfirm() {
			this.messageText = "移除成功"
			this.messageToggle('success')
			uni.showToast({ title: "移除成功", icon: "success", position: 'center' })
			this.dataList.splice(this.removeNum, 1)
			},
			// 取消移除
			@@ -395,8 +386,7 @@
			this.dataList[this.rowNum].batch = this.batch
			this.dataList[this.rowNum].weight = this.weight
			this.matnr = ''
			this.messageText = "修改成功"
			this.messageToggle('success')
			uni.showToast({ title: "修改成功", icon: "success", position: 'center' })
			this.$refs.revise.close()
			},
			reviseClose() {
			@@ -419,8 +409,7 @@
			let that = this;

			if (that.dataList.length === 0) {
			this.messageText = "托盘码组托数据有误"
			this.messageToggle('error')
			uni.showToast({ title: "托盘码组托数据有误", icon: "error", position: 'center' })
			return;
			}
			uni.request({
			@@ -429,26 +418,19 @@
			barcode: that.barcode,
			locNo: that.locNo
			},
			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: "error", position: 'center' })
			setTimeout(() => {
			uni.reLaunch({
			url: '../login/login'
			});
			uni.reLaunch({ url: '../login/login' });
			}, 1000);
			} else {
			that.messageText = res.msg
			that.messageToggle('error')
			uni.showToast({ title: res.msg, icon: "error", position: 'center' })
			}
			}
			});
			@@ -462,8 +444,7 @@
			// 确认重置
			resetConfirm() {
			this.dataList = []
			this.messageText = "重置完成"
			this.messageToggle('success')
			uni.showToast({ title: "重置完成", icon: "success", position: 'center' })
			},
			// 取消重置
			resetClose() {