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

zrg

2026-01-28 b298e383b1f2ddc0cb8ad1715512f2be6eb7ef02

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

 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -2072,6 +2072,8 @@
                        data
                    } = res.data;
                    if (count == 1) {
                        // 判断是否自动审核
                        
                        uni.showModal({
                            title: "提示",
                            content: res.data.Message + "。是否继续新增？",

 pages/shengchanrukushengdan/Kf_ProductInBill.vue

@@ -353,7 +353,7 @@
                    HRedBlueFlag: false,

                    HBarCode: '',
                    HQty: '',
                    HQty: '', // 数量
                    HWHName: getUserInfo().HWHName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
@@ -420,9 +420,11 @@
                }
            }
        },
        onLoad(e) {
        async onLoad(e) {
            console.log(e, this.userInfo)
            this.OperationType = e.OperationType
            await this.GetSourceBillType()

            if (e.HInterID) {
                this.HInterID_Temp = e.HInterID
                // this.btnType = 1
@@ -437,7 +439,6 @@
            this.getHEmpList()
            this.getHDeptList()

            this.GetSourceBillType()
            this.getRelationStore()

            uni.$on('BillSelectComplete', (e) => {
@@ -730,13 +731,15 @@
            },
            // 通过单据类型获取源单类型
            async GetSourceBillType() {
                CommonUtils.doRequest2({
                try {
                    let res = await CommonUtils.doRequest2Async({
                    url: '/Web/GetHSourceBillTypeByBillType',
                    data: {
                        HBillType: this.hform.HBillType,
                        Num: 2
                    },
                    resFunction: (res) => {
                        }
                    })

                        let {
                            data,
                            count,
@@ -757,14 +760,17 @@
                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
                        } else {
                            uni.showToast({
                                icon: 'none',
                                title: Message
                        CommonUtils.showTips({
                            title: "温馨提示",
                            message: Message
                            })
                        }
                    }

                } catch (err) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: err
                })
                }
            },
            //源单资料
            getHYDList() {
@@ -1627,6 +1633,7 @@
            },
            //修改回填数据
            RoadBillMain(HInterID) {
                console.log('HInterID: ', HInterID);
                uni.request({
                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
                    data: {
@@ -1637,6 +1644,7 @@
                        console.log(33, res.data.data[0]);
                        if (res.data.count == 1) {
                            var data = res.data.data[0]
                            console.log('data: ', data);
                            this.hform.HInterID = data.HInterID
                            this.hform.HBillNo = data.HBillNo
                            this.hform.HMainSourceBillType = data.HSourceBillType