~jhz/STUWMS.git

parent: 372b5a0d | 补丁 | 提交 | ignore whitespace

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2025-07-29 07eba43f0a3f61192bf6ded1cd89a4b941d05459

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

5个文件已修改

	manifest.json	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/gongxuIn/form.vue	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/gongxuOut/form.vue	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaigxIn/form.vue	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaigxOut/form.vue	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.23",
    "versionCode" : 123,
    "versionName" : "1.0.25",
    "versionCode" : 125,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/gongxuIn/form.vue

@@ -924,9 +924,9 @@
                            console.log(1,res);
                            uni.hideLoading()
                            if(res.data.count == 1){
                                let pages = getCurrentPages();
                                let prePage = pages[pages.length - 2]; 
                                prePage.$vm.getList()
                                // let pages = getCurrentPages();
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if(this.isEdit){
                                    setTimeout(()=>{
                                        uni.redirectTo({
@@ -934,15 +934,26 @@
                                        })
                                    },1000)
                                }else{
                                    setTimeout(()=>{
                                        uni.navigateBack()
                                    },1000)
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url:'/pages/gongxuIn/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(()=>{
                                                    uni.navigateBack();
                                                },50)
                                            }
                                        }
                                    });
                                }
                            }
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })

                        },
                        fail: (res) => {
                            console.log(res);

 pages/gongxuOut/form.vue

@@ -4,7 +4,7 @@
            <view class="form-item">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="请扫描条码"/>
                    <input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码" @confirm="toInCode(e)"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
            </view>
@@ -452,7 +452,7 @@
                    HProcNo:'',
                    HQty:'',
                    // HPieceQty:'',
                    HWasterQty:'',
                    HWasterQty:0,
                    HSourceName:'',
                    HSourceID:0,
                    HCenterName:'',
@@ -567,6 +567,7 @@
                // const str = "GXLX250603001-01@10";
                uni.scanCode({
                    onlyFromCamera: true,
                    // autoZoom:false,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        var str = res.result
@@ -575,13 +576,25 @@
                          this.hform.HBarCode = parts[0]
                          this.hform.HProcNo = parts[1]
                          this.getHBarCodeData(parts[0])
                          this.getHProcNoData(parts[0],parts[1])
                          // this.getHProcNoData(parts[0],parts[1])
                        }else{
                            this.hform.HBarCode = res.result
                            this.getHBarCodeData(res.result)
                        }
                    }
                });
            },
            toInCode(e){
                var str = this.hform.HBarCode
                if(str.includes('@')) {
                  const parts = str.split('@');
                  this.hform.HBarCode = parts[0]
                  this.hform.HProcNo = parts[1]
                  this.getHBarCodeData(parts[0])
                  // this.getHProcNoData(parts[0],parts[1])
                }else{
                    this.getHBarCodeData(this.hform.HBarCode)
                }
            },
            //扫流水号
            toScanProcNo(){
@@ -1041,7 +1054,7 @@
                        if(res.data.code == 1){
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode)
                            this.getHProcNoData(data.HBarCode,data.HProcNo)
                            // this.getHProcNoData(data.HBarCode,data.HProcNo)
                            
                            this.hform.HInterID= data.HInterID
                            this.hform.HBillNo= data.HBillNo
@@ -1141,6 +1154,8 @@
                            this.hform.HCenterName= data.工作中心
                            this.hform.HCenterID= data.HCenterID
                            this.hform.NoOutboundHqty= (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
							
                            this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
                        }else{
                            uni.showToast({
                                title:res.data.Message,
@@ -1268,9 +1283,10 @@
                                //         this.baofei()
                                //     }
                                // }
                                let pages = getCurrentPages();
                                let prePage = pages[pages.length - 2]; 
                                prePage.$vm.getList()
								
                                // let pages = getCurrentPages();
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if(this.isEdit){
                                    setTimeout(()=>{
                                        uni.redirectTo({
@@ -1278,15 +1294,25 @@
                                        })
                                    },1000)
                                }else{
                                    setTimeout(()=>{
                                        uni.navigateBack()
                                    },1000)
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url:'/pages/gongxuOut/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(()=>{
                                                    uni.navigateBack();
                                                },50)
                                            }
                                        }
                                    });
                                }
                            }
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        },
                        fail: (res) => {
                            console.log(res);

 pages/weiwaigxIn/form.vue

@@ -414,7 +414,7 @@
                          this.hform.HBarCode = parts[0]
                          this.hform.HProcNo = parts[1]
                          this.getHBarCodeData(parts[0])
                          this.getHProcNoData(parts[0],parts[1])
                          // this.getHProcNoData(parts[0],parts[1])
                        }else{
                            this.hform.HBarCode = res.result
                            this.getHBarCodeData(res.result)
@@ -632,7 +632,7 @@
                        if(res.data.code == 1){
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode)
                            this.getHProcNoData(data.HBarCode,data.HProcNo)
                            // this.getHProcNoData(data.HBarCode,data.HProcNo)
                            
                            this.hform.HInterID= data.HInterID
                            this.hform.HBillNo= data.HBillNo
@@ -676,6 +676,8 @@
                            // this.hform.HCloseDate= data.HCloseDate
                            this.hform.HDeleteMan= data.HDeleteMan
                            this.hform.HDeleteDate= data.HDeleteDate
							
                            this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
                        }else{
                            uni.showToast({
                                title:res.data.Message,
@@ -845,9 +847,9 @@
                            console.log(1,res);
                            uni.hideLoading()
                            if(res.data.count == 1){
                                let pages = getCurrentPages();
                                let prePage = pages[pages.length - 2]; 
                                prePage.$vm.getList()
                                // let pages = getCurrentPages();
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if(this.isEdit){
                                    setTimeout(()=>{
                                        uni.redirectTo({
@@ -855,15 +857,25 @@
                                        })
                                    },1000)
                                }else{
                                    setTimeout(()=>{
                                        uni.navigateBack()
                                    },1000)
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url:'/pages/weiwaigxIn/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(()=>{
                                                    uni.navigateBack();
                                                },50)
                                            }
                                        }
                                    });
                                }
                            }
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        },
                        fail: (res) => {
                            console.log(res);

 pages/weiwaigxOut/form.vue

@@ -919,9 +919,9 @@
                            console.log(1,res);
                            uni.hideLoading()
                            if(res.data.count == 1){
                                let pages = getCurrentPages(); 
                                let prePage = pages[pages.length - 2]; 
                                prePage.$vm.getList()
                                // let pages = getCurrentPages(); 
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if(this.isEdit){
                                    setTimeout(()=>{
                                        uni.redirectTo({
@@ -929,15 +929,25 @@
                                        })
                                    },1000)
                                }else{
                                    setTimeout(()=>{
                                        uni.navigateBack()
                                    },1000)
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url:'/pages/weiwaigxOut/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(()=>{
                                                    uni.navigateBack();
                                                },50)
                                            }
                                        }
                                    });
                                }
                            }
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        },
                        fail: (res) => {
                            console.log(res);

			@@ -2,8 +2,8 @@
			"name" : "智云LMES",
			"appid" : "__UNI__B002F49",
			"description" : "",
			"versionName" : "1.0.23",
			"versionCode" : 123,
			"versionName" : "1.0.25",
			"versionCode" : 125,
			"transformPx" : false,
			/* 5+App特有相关 */
			"app-plus" : {

			@@ -924,9 +924,9 @@
			console.log(1,res);
			uni.hideLoading()
			if(res.data.count == 1){
			let pages = getCurrentPages();
			let prePage = pages[pages.length - 2];
			prePage.$vm.getList()
			// let pages = getCurrentPages();
			// let prePage = pages[pages.length - 2];
			// prePage.$vm.getList()
			if(this.isEdit){
			setTimeout(()=>{
			uni.redirectTo({
			@@ -934,15 +934,26 @@
			})
			},1000)
			}else{
			setTimeout(()=>{
			uni.navigateBack()
			},1000)
			uni.showModal({
			title: '提示',
			content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
			success: (res) => {
			if (res.confirm) {
			console.log('用户点击确定');
			uni.redirectTo({
			url:'/pages/gongxuIn/form?OperationType=1'
			})
			} else if (res.cancel) {
			console.log('用户点击取消');
			setTimeout(()=>{
			uni.navigateBack();
			},50)
			}
			}
			});
			}
			}
			uni.showToast({
			title:res.data.Message,
			icon:'none'
			})

			},
			fail: (res) => {
			console.log(res);

			@@ -4,7 +4,7 @@
			<view class="form-item">
			<view class="title"><text>*</text>条形码:</view>
			<view class="right" style="width: 380rpx;">
			<input name="HBarCode" v-model="hform.HBarCode" disabled placeholder="请扫描条码"/>
			<input name="HBarCode" v-model="hform.HBarCode" placeholder="请扫描条码" @confirm="toInCode(e)"/>
			</view>
			<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
			</view>
			@@ -452,7 +452,7 @@
			HProcNo:'',
			HQty:'',
			// HPieceQty:'',
			HWasterQty:'',
			HWasterQty:0,
			HSourceName:'',
			HSourceID:0,
			HCenterName:'',
			@@ -567,6 +567,7 @@
			// const str = "GXLX250603001-01@10";
			uni.scanCode({
			onlyFromCamera: true,
			// autoZoom:false,
			success: (res) => {
			console.log('条码内容：' + res.result);
			var str = res.result
			@@ -575,13 +576,25 @@
			this.hform.HBarCode = parts[0]
			this.hform.HProcNo = parts[1]
			this.getHBarCodeData(parts[0])
			this.getHProcNoData(parts[0],parts[1])
			// this.getHProcNoData(parts[0],parts[1])
			}else{
			this.hform.HBarCode = res.result
			this.getHBarCodeData(res.result)
			}
			}
			});
			},
			toInCode(e){
			var str = this.hform.HBarCode
			if(str.includes('@')) {
			const parts = str.split('@');
			this.hform.HBarCode = parts[0]
			this.hform.HProcNo = parts[1]
			this.getHBarCodeData(parts[0])
			// this.getHProcNoData(parts[0],parts[1])
			}else{
			this.getHBarCodeData(this.hform.HBarCode)
			}
			},
			//扫流水号
			toScanProcNo(){
			@@ -1041,7 +1054,7 @@
			if(res.data.code == 1){
			var data = res.data.data[0]
			this.getHBarCodeData(data.HBarCode)
			this.getHProcNoData(data.HBarCode,data.HProcNo)
			// this.getHProcNoData(data.HBarCode,data.HProcNo)

			this.hform.HInterID= data.HInterID
			this.hform.HBillNo= data.HBillNo
			@@ -1141,6 +1154,8 @@
			this.hform.HCenterName= data.工作中心
			this.hform.HCenterID= data.HCenterID
			this.hform.NoOutboundHqty= (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)

			this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
			}else{
			uni.showToast({
			title:res.data.Message,
			@@ -1268,9 +1283,10 @@
			// this.baofei()
			// }
			// }
			let pages = getCurrentPages();
			let prePage = pages[pages.length - 2];
			prePage.$vm.getList()

			// let pages = getCurrentPages();
			// let prePage = pages[pages.length - 2];
			// prePage.$vm.getList()
			if(this.isEdit){
			setTimeout(()=>{
			uni.redirectTo({
			@@ -1278,15 +1294,25 @@
			})
			},1000)
			}else{
			setTimeout(()=>{
			uni.navigateBack()
			},1000)
			uni.showModal({
			title: '提示',
			content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
			success: (res) => {
			if (res.confirm) {
			console.log('用户点击确定');
			uni.redirectTo({
			url:'/pages/gongxuOut/form?OperationType=1'
			})
			} else if (res.cancel) {
			console.log('用户点击取消');
			setTimeout(()=>{
			uni.navigateBack();
			},50)
			}
			}
			});
			}
			}
			uni.showToast({
			title:res.data.Message,
			icon:'none'
			})
			},
			fail: (res) => {
			console.log(res);

			@@ -414,7 +414,7 @@
			this.hform.HBarCode = parts[0]
			this.hform.HProcNo = parts[1]
			this.getHBarCodeData(parts[0])
			this.getHProcNoData(parts[0],parts[1])
			// this.getHProcNoData(parts[0],parts[1])
			}else{
			this.hform.HBarCode = res.result
			this.getHBarCodeData(res.result)
			@@ -632,7 +632,7 @@
			if(res.data.code == 1){
			var data = res.data.data[0]
			this.getHBarCodeData(data.HBarCode)
			this.getHProcNoData(data.HBarCode,data.HProcNo)
			// this.getHProcNoData(data.HBarCode,data.HProcNo)

			this.hform.HInterID= data.HInterID
			this.hform.HBillNo= data.HBillNo
			@@ -676,6 +676,8 @@
			// this.hform.HCloseDate= data.HCloseDate
			this.hform.HDeleteMan= data.HDeleteMan
			this.hform.HDeleteDate= data.HDeleteDate

			this.getHProcNoData(this.hform.HBarCode,this.hform.HProcNo)
			}else{
			uni.showToast({
			title:res.data.Message,
			@@ -845,9 +847,9 @@
			console.log(1,res);
			uni.hideLoading()
			if(res.data.count == 1){
			let pages = getCurrentPages();
			let prePage = pages[pages.length - 2];
			prePage.$vm.getList()
			// let pages = getCurrentPages();
			// let prePage = pages[pages.length - 2];
			// prePage.$vm.getList()
			if(this.isEdit){
			setTimeout(()=>{
			uni.redirectTo({
			@@ -855,15 +857,25 @@
			})
			},1000)
			}else{
			setTimeout(()=>{
			uni.navigateBack()
			},1000)
			uni.showModal({
			title: '提示',
			content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
			success: (res) => {
			if (res.confirm) {
			console.log('用户点击确定');
			uni.redirectTo({
			url:'/pages/weiwaigxIn/form?OperationType=1'
			})
			} else if (res.cancel) {
			console.log('用户点击取消');
			setTimeout(()=>{
			uni.navigateBack();
			},50)
			}
			}
			});
			}
			}
			uni.showToast({
			title:res.data.Message,
			icon:'none'
			})
			},
			fail: (res) => {
			console.log(res);

			@@ -919,9 +919,9 @@
			console.log(1,res);
			uni.hideLoading()
			if(res.data.count == 1){
			let pages = getCurrentPages();
			let prePage = pages[pages.length - 2];
			prePage.$vm.getList()
			// let pages = getCurrentPages();
			// let prePage = pages[pages.length - 2];
			// prePage.$vm.getList()
			if(this.isEdit){
			setTimeout(()=>{
			uni.redirectTo({
			@@ -929,15 +929,25 @@
			})
			},1000)
			}else{
			setTimeout(()=>{
			uni.navigateBack()
			},1000)
			uni.showModal({
			title: '提示',
			content: res.data.Message + '。是否继续新增？(点击取消返回上级页面)',
			success: (res) => {
			if (res.confirm) {
			console.log('用户点击确定');
			uni.redirectTo({
			url:'/pages/weiwaigxOut/form?OperationType=1'
			})
			} else if (res.cancel) {
			console.log('用户点击取消');
			setTimeout(()=>{
			uni.navigateBack();
			},50)
			}
			}
			});
			}
			}
			uni.showToast({
			title:res.data.Message,
			icon:'none'
			})
			},
			fail: (res) => {
			console.log(res);