修复登录模块 更改 服务地址后,组织有旧数据残留的问题;采购条码模块 添加 批次属性
12个文件已修改
69 ■■■■ 已修改文件
pages/caigoudingdan/generate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/form.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigoutuiliao/form.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitachuku_v2/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitaruku_v2/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliaoshengdan/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanrukushengdan/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tiaomadaying/tiaomadaying.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwailingliao/form.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zhijiediaobo/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigoudingdan/generate.vue
@@ -173,7 +173,7 @@
                                HMaterNumber: d['物料编码'],
                                HMaterName: d['物料名称'],
                                HMaterModel: d['规格型号'],
                                // HBatchNo: d['批号'],
                                HBatchNo: d['批号'],
                                HQty: d['数量'],
                                HMinQty: d['数量'],
                                HBQty: d['数量'],
pages/caigouruku/form.vue
@@ -368,12 +368,14 @@
            this.getHDeptList()
            this.GetSourceBillType()
            this.getRelationStore()
            uni.$on('BillSelectComplete', (e) => {
                console.log("接收到的消息: ", e.HBillNo)
                this.getHBarCodeData(e.HBillNo)
                this.$refs.billList.exit()
            })
        },
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
            async getRelationStore() {
@@ -518,13 +520,20 @@
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            onSourceBillBlurHandler() {
            async onSourceBillBlurHandler() {
                if (this.hform.HMainSourceBillType == -1) {
                    this.playSound(1)
                    this.barCodeFocus = true
                    return
                }
                let inputVal = this.$refs.uniComboxSourceBill.inputVal
                let inputVal = ''
                if (this.$refs.uniComboxSourceBill) {
                    inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HSourceBillNo
                } else {
                    inputVal = this.hform.HSourceBillNo
                }
                if (inputVal == '') {
                    CommonUtils.playSound(0)
                    this.refreshHSourceBillState()
pages/caigoutuiliao/form.vue
@@ -68,7 +68,7 @@
                    <view class="right" v-show="showHSourceBillNo">
                        <!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="请输入源单单号"
                            v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
                        <input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
                        <input :focus="HSourceBillNoFocus" @confirm="onSourceBillBlurHandler" type="text"
                            name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="请输入源单单号" />
                    
                    </view>
@@ -252,10 +252,14 @@
    import {
        CommonUtils
    } from '../../utils/common';
    import { getUserStockRelation } from '../../utils/userRelationManager';
    import {
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    export default {
        components: {BillListPopupVue},
        components: {
            BillListPopupVue
        },
        data() {
            return {
                HSourceBillNoFocus: false,
@@ -365,7 +369,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
@@ -418,7 +422,17 @@
                innerAudioContext.play(); // 播放音频
            },
            onSourceBillBlurHandler() {
                let inputVal = this.$refs.uniComboxSourceBill.inputVal
                if (this.hform.HMainSourceBillType == -1) {
                    this.playSound(1)
                    this.barCodeFocus = true
                    return
                }
                let inputVal = ''
                if (this.$refs.uniComboxSourceBill) {
                    inputVal = this.$refs.uniComboxSourceBill.inputVal || this.hform.HSourceBillNo
                } else {
                    inputVal = this.hform.HSourceBillNo
                }
                if (inputVal == '') {
                    CommonUtils.playSound(0)
                    return uni.showToast({
@@ -525,7 +539,9 @@
                this.hform.HDate = e.detail.value
            },
            //基础仓库资料
            getHBaseList({sWhere=""} = {}) {
            getHBaseList({
                sWhere = ""
            } = {}) {
                uni.request({
                    url: this.serverUrl + '/Gy_Warehouse/list',
                    data: {
@@ -1534,5 +1550,4 @@
        pointer-events: none;
        touch-action: none;
    }
</style>
pages/index/login.vue
@@ -191,6 +191,7 @@
            },
            getOrganization() {
                this.arrayOrganization = []
                uni.request({
                    url: this.serverUrl + '/Web/GetOrganizations',
                    success: (res) => {
pages/qitachuku_v2/form.vue
@@ -428,7 +428,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
pages/qitaruku_v2/form.vue
@@ -426,7 +426,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
pages/shengchanlingliaoshengdan/form.vue
@@ -410,7 +410,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
pages/shengchanrukushengdan/form.vue
@@ -406,7 +406,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
pages/tiaomadaying/tiaomadaying.vue
@@ -240,7 +240,7 @@
                    HMaterNumber: d['物料编码'],
                    HMaterName: d['物料名称'],
                    HMaterModel: d['规格型号'],
                    // HBatchNo: d['批号'],
                    HBatchNo: d['批号'],
                    HQty: !CommonUtils.isEmpty(HQty) ? HQty : d['数量'],
                    HMinQty: d['数量'],
                    HBQty: d['数量'],
pages/weiwailingliao/form.vue
@@ -405,7 +405,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
@@ -878,6 +878,12 @@
            },
            //选中源单
            getHBarCodeData(HBarCode) {
                if(this.hform.HMainSourceBillType == -1) {
                    this.playSound(1)
                    this.barCodeFocus = true
                    return
                }
                if (!this.hform.HFIFOWHName) {
                    this.hform.HFIFOWHID = 0
                }
pages/xiaoshouchuku/form.vue
@@ -413,7 +413,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        methods: {
pages/zhijiediaobo/form.vue
@@ -530,7 +530,7 @@
                this.$refs.billList.exit()
            })
        },
        beforeDestroy() {
        onUnload() {
            uni.$off('BillSelectComplete')
        },
        computed: {