模块添加 仓库扫码/仓位扫码 添加小卫电器扫物料码获取对应单据信息 模块
1个文件已添加
9个文件已修改
630 ■■■■■ 已修改文件
components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue 322 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/form.vue 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigoutuiliao/form.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliaoshengdan/form.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanrukushengdan/form.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchantuiliao/form.vue 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/form.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zhijiediaobo/form.vue 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
uni_modules/uni-combox/components/uni-combox/uni-combox.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/common.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue
New file
@@ -0,0 +1,322 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="content">
                <view class="search-condition">
                    <view class="title">
                        条码:
                    </view>
                    <view class="right">
                        <input type="text" v-model="HBarCode" @confirm="getCode(HBarCode)" />
                    </view>
                    <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>
                </view>
                <view class="buttons">
                    <view style="flex: 1;"></view>
                    <button size="mini" type="primary" @click="clear">重置</button>
                    <button size="mini" type="primary" @click="search">搜索</button>
                    <button size="mini" type="primary" @click="exit">退出</button>
                </view>
                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
                    <view class="options-wrapper" v-show="HBillList.length != 0">
                        <uni-card class="option-card" v-for="(bill, index) in HBillList[curPage-1]" :key="index"
                            :title="bill['物料名称']"  @tap="clickCard(bill['HSourceInterID'], bill['单据号'])" >
                            <view class="item">
                                <view class="left">发货通知单号: </view>
                                <view class="right">{{bill['单据号']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">物料代码: </view>
                                <view class="right">{{bill['物料代码']}}</view>
                            </view>
                            <!-- <view class="item">
                                <view class="left">物料名称: </view>
                                <view class="right">{{}}</view>
                            </view> -->
                            <view class="item">
                                <view class="left">规格型号: </view>
                                <view class="right">{{bill['规格型号']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">数量: </view>
                                <view class="right">{{bill['数量']}}</view>
                            </view>
                        </uni-card>
                    </view>
                    <view class="over" v-show="HBillList.length == 0">暂无数据</view>
                </scroll-view>
                <uni-pagination id="#pagination" title="标题文字" v-model="curPage" :pageSize="size"
                    :total="length"></uni-pagination>
            </view>
        </uni-popup>
    </view>
</template>
<script>
    import {
        CommonUtils
    } from '../../utils/common';
    import {
        getUserInfo
    } from '../../utils/auth';
    export default {
        name: "PushSeOutStockBillPopup",
        data() {
            return {
                size: 20,
                curPage: 1,
                length: 0,
                page: 0,
                HSourceBillNo: '',
                HMater: '',
                HCustom: '',
                HBillList: [],
                panelHeight: 0,
                HBarCode: '',
                HBillNo: '',
                HCustomer: '',
                HSeller: '',
                HMaterialID: ''
            };
        },
        props: {
            HBillType: {
                type: [String, Number],
                required: true
            },
            HSourceBillType: {
                type: [String, Number],
                required: true
            },
            HStockOrgID: {
                type: [String, Number],
                required: true
            },
        },
        model: {
            prop: "HSourceBill",
            event: 'change'
        },
        methods: {
            clear() {
                this.HBarCode = ''
                this.HMaterialID = '',
                this.HBillNo = '',
                this.HCustom = '',
                this.HSeller = '',
                this.search()
            },
            popupChangeHandler(e) {
                if (e.show === true) {
                    this.getBillList()
                } else {
                    // 清理资源
                    this.size = 20
                    this.curPage = 1
                    this.length = 0
                    this.page = 0
                    this.HSourceBillNo = ''
                    this.HMater = ''
                    this.HCustom = ''
                    this.HBillList = []
                }
            },
            exit() {
                this.$refs.popup.close();
            },
            search() {
                this.getBillList()
            },
            showPopup() {
                this.$refs.popup.open();
            },
            clickCard(interid, billno) {
                uni.$emit('BillSelectComplete', {
                    HInterID: interid,
                    HBillNo: billno
                })
                // this.exit()
            },
            toScanCode() {
                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
                mpaasScanModule.mpaasScan({
                    'hideAlbum': true,
                    'timeoutInterval': '10', //超时时间
                    'timeoutText': '未识别到二维码' //超时提醒
                }, (ret) => {
                    console.log(ret.resp_result)
                    this.HBarCode = ret.resp_result
                    this.getCode(ret.resp_result)
                })
            },
            async getCode(BarCode) {
                console.log(BarCode)
                try {
                    let barCodeMeta = await this.getMaterialInfo(BarCode)
                    console.log('barCodeMeta: ', barCodeMeta);
                    this.HMaterialID = barCodeMeta[0]['HMaterID']
                    // this.getMater()
                    console.log('执行: getMater')
                    this.getBillList()
                } catch (err) {
                    return
                }
            },
            async getMaterialInfo(BarCode) {
                return new Promise((resolve, reject) => {
                    CommonUtils.doRequest2({
                        url: "/Gy_BarCodeBillList/GetBarCodeBillList",
                        data: {
                            sWhere: ` and 条码编号 = N'${BarCode}'`,
                            user: getUserInfo()['Czymc'],
                        },
                        resFunction: (res) => {
                            let {
                                count,
                                Message,
                                data
                            } = res.data
                            if (count == 1) {
                                resolve(data)
                            } else {
                                uni.showToast({
                                    icon: 'none',
                                    title: Message
                                })
                                reject()
                            }
                        },
                        errFunction: () => {
                            reject()
                        }
                    })
                })
            },
            getBillList() {
                let sWhere = ''
                this.HBillList = []
                this.length = 0
                this.page = 0
                this.curPage = 1
                if(this.HBarCode) {
                    sWhere += ` and b.HMaterID = ${this.HMaterialID}`
                }
                CommonUtils.doRequest2({
                    url: '/web/XiaoWeiBarCodeQuery',
                    data: {
                        'sWhere': sWhere,
                        HBillType: this.HBillType,
                        HSourceBillType: this.HSourceBillType
                    },
                    resFunction: (res) => {
                        let {
                            data,
                            count,
                            Message
                        } = res.data
                        if (count > 0) {
                            this.length = Array.from(data).length
                            const result = [];
                            for (let i = 0; i < data.length; i += this.size) {
                                result.push(data.slice(i, i + this.size));
                            }
                            this.HBillList = result
                            this.page = result.length
                        } else {
                            uni.showToast({
                                icon: 'none',
                                title: Message
                            })
                        }
                    }
                })
            },
        },
    }
</script>
<style lang="scss">
    .content {
        box-sizing: border-box;
        border-radius: 15rpx 15rpx 0 0;
        padding: 20rpx 20rpx 40rpx 20rpx;
        background-color: #fff;
        display: flex;
        flex-direction: column;
        gap: 10rpx;
        .search-condition {
            display: flex;
            flex-direction: row;
            align-items: center;
            padding: 0 10rpx;
            gap: 20rpx;
            .title {
                width: 8em;
                text-align: right;
                font-size: 32rpx;
            }
            .right {
                flex: 1;
                border-radius: 22rpx;
                border: 1px solid #acacac;
                height: auto;
                input {
                    width: 100%;
                    padding: 8rpx 20rpx;
                    font-size: 24rpx;
                }
            }
        }
        .buttons {
            display: flex;
            flex-direction: row;
            gap: 20rpx;
            justify-content: flex-end;
            >button {
                display: inline-flex;
                width: 4rem;
            }
        }
        .options-wrapper {
            padding: 20rpx;
            display: grid;
            grid-template-columns: repeat(1, 1fr);
            gap: 20rpx;
            .option-card {
                margin: 0 !important;
                box-sizing: border-box;
                display: flex;
                flex-direction: column;
                flex-wrap: wrap;
                gap: 10rpx;
                .item {
                    display: flex;
                    flex-direction: row;
                    flex-wrap: wrap;
                    gap: 10rpx;
                    .right {
                        flex-wrap: wrap;
                        word-break: break-all;
                    }
                }
            }
        }
    }
</style>
pages/caigouruku/form.vue
@@ -21,14 +21,15 @@
                <view class="title">仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
                        placeholder="不可操作" :disabled="!showHStockPlaceName" /></view>
@@ -330,6 +331,7 @@
                    HBarCode: '',
                    HQty: '',
                    HQtyMust: '',
                    HWHName: getUserInfo().HWHName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
@@ -379,14 +381,13 @@
                this.barCodeFocus = true
            } else {
                this.getNewData();
                //如果服务器地址时海诚
                if(this.serverUrl=='http://122.228.39.234:7177/API/')
                {
                    this.barCodeFocus = true
                }else{
                    this.HSourceBillNoFocus = true
                }
                //如果服务器地址时海诚
                if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
                    this.barCodeFocus = true
                } else {
                    this.HSourceBillNoFocus = true
                }
            }
            this.getHSupList()
@@ -404,6 +405,33 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                }else {
                    this.HWHNameChange(this.HWHNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ',index);
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                }else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                }
            },
            async qrCodeDisplay() {
                try {
                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -750,7 +778,7 @@
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
pages/caigoutuiliao/form.vue
@@ -21,14 +21,14 @@
                <view class="title">仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange" @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
                        placeholder="不可操作" disabled="" /></view>
@@ -381,6 +381,33 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                }else {
                    this.HWHNameChange(this.HWHNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ',index);
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                }else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                }
            },
            async qrCodeDisplay() {
                try {
                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -682,7 +709,7 @@
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
pages/shengchanlingliaoshengdan/form.vue
@@ -21,14 +21,14 @@
                <view class="title">仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="HIsStockMgr">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange" @confirm='HStockPlaceNameScan'></uni-combox>
                </view>
                <view class="righton" v-show="!HIsStockMgr">
                    <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
@@ -459,6 +459,35 @@
            }
        },
        methods: {
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                }else {
                    this.HWHNameChange(this.HWHNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ',index);
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                }else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                }
            },
            async qrCodeDisplay() {
                try {
                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -781,7 +810,7 @@
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
pages/shengchanrukushengdan/form.vue
@@ -281,7 +281,9 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
        <BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillSelectPopupXiaoWeiVue>
        <BillListPopupVue v-else-if="enableModule == 2" ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
    </view>
@@ -299,6 +301,7 @@
    import {
        getUserStockRelation
    } from "@/utils/userRelationManager.js"
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
    export default {
        data() {
            return {
@@ -320,7 +323,7 @@
                tabs: 0,
                HMainSourceBillType: '生产订单',
                arrayHMainSourceBillType: ['生产订单', '生产汇报单', '工序汇报单', '手工录入'],
                arrayHMainSourceBillValue: [3710, 3711, 3714],
                arrayHMainSourceBillValue: [3710, 3711, 3714, -1],
                linterid: '',
                HBillNo: '',
                btnType: 0, //0新增,1修改,2审核,3反审核
@@ -388,7 +391,24 @@
        },
        components: {
            BillListPopupVue,
            BarCodePopupVue
            BarCodePopupVue,
            BillSelectPopupXiaoWeiVue
        },
        computed: {
            enableModule: {
                get() {
                    if (this.hform.HMainSourceBillType == 3710 &&
                      /小卫|智云/.test(uni.getStorageSync('Organization'))
                    ) {
                        return 1
                    } else {
                        return 2
                    }
                }
                // 其他条件
            },
        },
        onLoad(e) {
            console.log(e, this.userInfo)
pages/shengchantuiliao/form.vue
@@ -3,7 +3,7 @@
        <view class="form">
            <view class="form-item">
                <view class="title">条码:</view>
                <view class="right" >
                <view class="right">
                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="请扫描(或输入)条码"
                        @confirm="getCode(hform.HBarCode)" />
                </view>
@@ -21,14 +21,15 @@
                <view class="title">仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                        @input="HWHNameChange"></uni-combox>
                        @input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">仓位:</view>
                <view class="right" v-show="showHStockPlaceName">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
                        @confirm="HStockPlaceNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
@@ -281,8 +282,10 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
            :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <BillSelectPopupXiaoWeiVue v-if="enableModule == 1" ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"></BillSelectPopupXiaoWeiVue>
        <BillListPopupVue v-else-if="enableModule == 2" ref="billList" :HBillType="hform.HBillType"
            :HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID"></BillListPopupVue>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
    </view>
</template>
@@ -299,6 +302,7 @@
    import {
        getUserStockRelation
    } from "@/utils/userRelationManager.js"
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
    export default {
        data() {
            return {
@@ -388,7 +392,24 @@
        },
        components: {
            BillListPopupVue,
            BarCodePopupVue
            BarCodePopupVue,
            BillSelectPopupXiaoWeiVue
        },
        computed: {
            enableModule: {
                get() {
                    if (this.hform.HMainSourceBillType == 1204 &&
                        /小卫|智云/.test(uni.getStorageSync('Organization'))
                    ) {
                        return 1
                    } else {
                        return 2
                    }
                }
                // 其他条件
            },
        },
        onLoad(e) {
            console.log(e, this.userInfo)
@@ -420,6 +441,33 @@
            uni.$off('BillSelectComplete')
        },
        methods: {
            async HWHNameScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                } else {
                    this.HWHNameChange(this.HWHNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ', index);
                if (index == -1) {
                    uni.showToast({
                        icon: 'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                } else {
                    this.HStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                }
            },
            async qrCodeDisplay() {
                try {
                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -754,7 +802,7 @@
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
@@ -1168,7 +1216,7 @@
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                                this.refreshBarCodeState()
                                this.refreshBarCodeState()
                            } else {
                                this.playSound(0)
                                this.refreshBarCodeState()
pages/xiaoshouchuku/form.vue
@@ -333,7 +333,7 @@
                tabs: 0,
                HMainSourceBillType: '发货通知单',
                arrayHMainSourceBillType: ['发货通知单', '销售订单', '手工录入'],
                arrayHMainSourceBillValue: ['1402','1401','-1'],
                linterid: '',
                HBillNo: '',
                btnType: 0, //0新增,1修改,2审核,3反审核
@@ -1137,9 +1137,9 @@
                                            this.hform.HDeptID = data.hDeptIDField
                                            this.hform.HDeptName = data.hDeptNameField
                                        }
                                        console.log(data)
                                        //获取源单类型、源单单号
                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
                                        console.log('物料条码', data)
                                        //获取源单类型、源单单号 无源单类型视为手工录入
                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField || -1
                                        let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
                                            .hSourceBillTypeField)
pages/zhijiediaobo/form.vue
@@ -21,14 +21,15 @@
                <view class="title">调出仓库:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHWHName" placeholder="请输入(或扫描)仓库" v-model="hform.HSCWHName"
                        @input="HSCWHNameChange"></uni-combox>
                        @input="HSCWHNameChange" @confirm="HWHNameOutScan"></uni-combox>
                </view>
            </view>
            <view class="form-item">
                <view class="title">调出仓位:</view>
                <view class="right" v-show="HSCIsStockMgr">
                    <uni-combox :candidates="arrayHStockPlaceName" placeholder="请输入(或扫描)仓位"
                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"></uni-combox>
                        v-model="hform.HOutStockPlaceName" @input="HOutStockPlaceNameChange"
                        @confirm="HStockPlaceOutNameScan"></uni-combox>
                </view>
                <view class="righton" v-show="!HSCIsStockMgr">
                    <input v-model="hform.HOutStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
@@ -159,14 +160,15 @@
                    <view class="title">调入仓库:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHWHInName" placeholder="请输入(或扫描)仓库" v-model="hform.HWHName"
                            @input="HWHInNameChange"></uni-combox>
                            @input="HWHInNameChange" @confirm="HWHNameInScan"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">调入仓位:</view>
                    <view class="right" v-show="HIsStockMgr">
                        <uni-combox :candidates="arrayHStockPlaceInName" placeholder="请输入(或扫描)仓位"
                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"></uni-combox>
                            v-model="hform.HStockPlaceName" @input="HStockPlaceInNameChange"
                            @confirm="HStockPlaceNameInScan"></uni-combox>
                    </view>
                    <view class="righton" v-show="!HIsStockMgr">
                        <input v-model="hform.HStockPlaceName" :disabled="!HIsStockMgr" placeholder="不可操作" />
@@ -518,7 +520,7 @@
                this.getNewData()
            }
            //this.getHWarehouseInList()
            this.getHWarehouseInList()
            // this.getHBaseList()
            this.getHSupList()
            this.getHEmpList()
@@ -550,6 +552,60 @@
            }
        },
        methods: {
            async HWHNameOutScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHNameList.findIndex(elem => elem['条码编号'] == e)
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                }else {
                    this.HWHNameChange(this.HWHNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceOutNameScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ',index);
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                }else {
                    this.HOutStockPlaceNameChange(this.HStockPlaceNameList[index]['仓位名称'])
                }
            },
            async HWHNameInScan(e) {
                // 扫描仓库码
                console.log('仓库码: ', e);
                let index = this.HWHInNameList.findIndex(elem => elem['条码编号'] == e)
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓库条码对应的仓库不存在...'
                    })
                }else {
                    this.HWHInNameChange(this.HWHInNameList[index]['仓库名称'])
                }
            },
            async HStockPlaceNameInScan(e) {
                // 扫描仓位码
                console.log('仓位码: ', e);
                let index = this.HStockPlaceInNameList.findIndex(elem => elem['条码编号'] == e)
                console.log('index: ',index);
                if(index == -1){
                    uni.showToast({
                        icon:'none',
                        title: '扫描仓位条码对应的仓位不存在...'
                    })
                }else {
                    this.HStockPlaceNameChange(this.HStockPlaceInNameList[index]['仓位名称'])
                }
            },
            async qrCodeDisplay() {
                try {
                    this.$refs.barcodePopup.setCodeInfo(this.hform.HBillNo)
@@ -583,14 +639,16 @@
                    this.getHBaseList()
                }
            },
            // 调入仓库修改
            HStockPlaceInNameChange(e) {
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
            // 调入仓位修改
            HWHInNameChange(e) {
                console.log('e: ', e);
                for (var i = 0; i < this.HWHInNameList.length; i++) {
@@ -1093,11 +1151,13 @@
                            this.HIsStockMgr = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.hform.HStockPlaceID = ''
                            this.HIsStockMgr = false
                        }
                    }
                }
            },
            // 调出仓库修改
            HSCWHNameChange(e) {
                // var name = e.split("(")
                for (var i = 0; i < this.HWHNameList.length; i++) {
@@ -1108,7 +1168,8 @@
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.HSCIsStockMgr = true
                        } else {
                            this.hform.HStockPlaceName = ''
                            this.hform.HOutStockPlaceName = ''
                            this.hform.HOutStockPlaceID = ''
                            this.HSCIsStockMgr = false
                        }
                    }
@@ -1126,16 +1187,17 @@
            HStockPlaceNameChange(e) {
                for (var i = 0; i < this.HStockPlaceNameList.length; i++) {
                    if (this.HStockPlaceNameList[i].仓位名称 == e) {
                        console.log(this.HStockPlaceNameList[i]);
                        this.hform.HStockPlaceName = this.HStockPlaceNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HItemID
                        this.hform.HStockPlaceID = this.HStockPlaceNameList[i].HMainID
                    }
                }
            },
            HOutStockPlaceNameChange(e) {
                for (var i = 0; i < this.HStockPlaceInNameList.length; i++) {
                    if (this.HStockPlaceInNameList[i].仓位名称 == e) {
                        this.hform.HStockPlaceName = this.HStockPlaceInNameList[i].仓位名称
                        this.hform.HStockPlaceID = this.HStockPlaceInNameList[i].HItemID
                        this.hform.HOutStockPlaceName = this.HStockPlaceInNameList[i].仓位名称
                        this.hform.HOutStockPlaceID = this.HStockPlaceInNameList[i].HMainID
                    }
                }
            },
uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -155,10 +155,9 @@
                }, 153)
            },
            onConfirm() {
                setTimeout(() => {
                    this.showSelector = false
                    this.confirmCall()
                }, 153)
                this.showSelector = false
                this.$emit('confirm', this.inputVal)
                this.$emit('update:modelValue', this.inputVal)
            },
            onSelectorClick(index) {
                this.inputVal = this.filterCandidates[index]
utils/common.js
@@ -246,7 +246,7 @@
        })
    }
    
    doRequest2({url, data, resFunction, errFunction, method, that}){
    doRequest2({url, data, resFunction, errFunction,method, that}){
        that = that || this;
        let errorTip = null;
        uni.showLoading({
@@ -284,6 +284,7 @@
        
            },
            complete: () => {
                setTimeout(() => {
                    uni.hideLoading()
                    if (errorTip != null) {