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

zrg

昨天 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

@@ -32,7 +32,7 @@
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
<!--                <view class="righton" v-show="!showHStockPlaceName">
                <!--                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view> -->
            </view>
@@ -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) => {
@@ -479,9 +480,9 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                

                    if (res.data.count == 1) {
                

                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
@@ -492,7 +493,7 @@
                            icon: 'none'
                        })
                    }
                

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
@@ -730,41 +731,46 @@
            },
            // 通过单据类型获取源单类型
            async GetSourceBillType() {
                CommonUtils.doRequest2({
                    url: '/Web/GetHSourceBillTypeByBillType',
                    data: {
                        HBillType: this.hform.HBillType,
                        Num: 2
                    },
                    resFunction: (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count == 1) {
                            console.log('data: ', data);
                            this.arrayHMainSourceBillType = []
                            this.arrayHMainSourceBillValue = []
                            Array.from(data).forEach(e => {
                                this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
                                this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
                            })

                            this.arrayHMainSourceBillType.push('手工录入')
                            this.arrayHMainSourceBillValue.push('-1')

                            this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
                            this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
                        } else {
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetHSourceBillTypeByBillType',
                        data: {
                            HBillType: this.hform.HBillType,
                            Num: 2
                        }
                    }
                    })

                })
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count == 1) {
                        console.log('data: ', data);
                        this.arrayHMainSourceBillType = []
                        this.arrayHMainSourceBillValue = []
                        Array.from(data).forEach(e => {
                            this.arrayHMainSourceBillType.push(e['HSourceBillTypeName'])
                            this.arrayHMainSourceBillValue.push(e['HSourceBillType'])
                        })

                        this.arrayHMainSourceBillType.push('手工录入')
                        this.arrayHMainSourceBillValue.push('-1')

                        this.HMainSourceBillType = this.arrayHMainSourceBillType[0]
                        this.hform.HMainSourceBillType = this.arrayHMainSourceBillValue[0]
                    } else {
                        CommonUtils.showTips({
                            title: "温馨提示",
                            message: Message
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: err
                    })
                }
            },
            //源单资料
            getHYDList() {
@@ -816,11 +822,11 @@
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                            this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
                        } 
                        }
                    }
                }
            },
            async getStockPlaceRemote(HSPGroupID){
            async getStockPlaceRemote(HSPGroupID) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Gy_StockPlace/list',
@@ -830,7 +836,7 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
                

                    if (res.data.count == 1) {
                        this.HStockPlaceNameList = res.data.data
                        for (var i = 0; i < res.data.data.length; i++) {
@@ -842,7 +848,7 @@
                            icon: 'none'
                        })
                    }
                

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
@@ -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