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

chenhaozhe

2025-08-07 8a5c3be47f8f0618eaa391049d99b5c68aa712bf

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

 pages/gongxuOut/form.vue

@@ -459,6 +459,7 @@
            <view class="bottom-btn">
                <button v-if="btnType == 0 && !isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                <button v-if="btnType != 0 && !isEdit" class="btn-a" size="mini" @tap="ifEdit">修改</button>
                <button v-if="btnType != 0 && isEdit" class="btn-a" size="mini" @tap="submit">提交</button>
                <button v-if="btnType != 0 && btnType == 2" class="btn-b" style="margin-left: 20rpx;" size="mini"
                    @tap="check">审核</button>
                <button v-if="btnType != 0 && btnType == 3" class="btn-d" style="margin-left: 20rpx;" size="mini"
@@ -1468,10 +1469,13 @@
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if (this.isEdit) {
                                    uni.showToast({
                                        title: '修改成功',
                                        icon: 'none'
                                    })
                                    setTimeout(() => {
                                        uni.redirectTo({
                                            url: '/pages/gongxuOut/form?linterid=' + this
                                                .linterid + '&HBillNo=' + this.linterid
                                            url: '/pages/gongxuOut/table'
                                        })
                                    }, 1000)
                                } else {

 pages/weiwaigxOut/form.vue

@@ -458,7 +458,7 @@
                    HGroupName: '',
                    HGroupID: 0,
                    HDept: '',
                    HDeptID: '',
                    HDeptID: 0,

                    HMaker: '',
                    HMakeDate: '',
@@ -874,8 +874,8 @@
                        console.log(1, res.data.data[0]);
                        if (res.data.code == 1) {
                            var data = res.data.data[0]
                            this.getHBarCodeData(data.HBarCode)
                            this.getHProcNoData(data.HBarCode, data.HProcNo)
                            this.getHBarCodeData(data.HBarCode,1)
                            // this.getHProcNoData(data.HBarCode, data.HProcNo)

                            this.hform.HInterID = data.HInterID
                            this.hform.HBillNo = data.HBillNo
@@ -1115,10 +1115,13 @@
                                // let prePage = pages[pages.length - 2]; 
                                // prePage.$vm.getList()
                                if (this.isEdit) {
                                    uni.showToast({
                                        title: '修改成功',
                                        icon: 'none'
                                    })
                                    setTimeout(() => {
                                        uni.redirectTo({
                                            url: '/pages/weiwaigxOut/form?linterid=' + this
                                                .linterid + '&HBillNo=' + this.linterid
                                            url: '/pages/weiwaigxOut/table'
                                        })
                                    }, 1000)
                                } else {