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

wtt

2025-11-20 de32eaefeb995ce67a638ca82bc6760075af2eb5

 pages/gongxuOut/Cj_StationOutBill.vue

File was renamed from pages/gongxuOut/form.vue
@@ -1711,7 +1711,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: '/pages/gongxuOut/form?OperationType=1'
                    url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                })
            },
            submit() {
@@ -1787,7 +1787,7 @@
                           })
                                    setTimeout(() => {
                                        uni.redirectTo({
                                            url: '/pages/gongxuOut/table'
                                            url: '/pages/gongxuOut/Cj_StationOutBillList'
                                        })
                                    }, 1000)
                                } else {
@@ -1799,7 +1799,7 @@
                                                console.log('用户点击确定');
                                    this.getNextProc()
                                                // uni.redirectTo({
                                                //     url: '/pages/gongxuOut/form?OperationType=1'
                                                //     url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                                // })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
@@ -1807,7 +1807,7 @@
                                                //     uni.navigateBack();
                                                // }, 50)
                                    uni.redirectTo({
                                        url: '/pages/gongxuOut/form?OperationType=1'
                                        url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                                    })
                                            }
                                        }
@@ -1973,13 +1973,13 @@
                            icon: 'none'
                        })
                        uni.redirectTo({
                            url: '/pages/gongxuOut/form?OperationType=1'
                            url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1'
                        })
                     }else{
                        this.hform.HProcNo=nextProcess["工序号"];
                        const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
                        uni.redirectTo({
                            url: '/pages/gongxuOut/form?OperationType=1&HBarCode='+HNextBarCode
                            url: '/pages/gongxuOut/Cj_StationOutBill?OperationType=1&HBarCode='+HNextBarCode
                        })
                     }
                    }else{