chenhaozhe
2025-09-04 45b4cbd921589ff8d6ea6ff5bb3a02a7eb6435d7
生产领料单 问题修复
6个文件已修改
4个文件已添加
183 ■■■■■ 已修改文件
components/BillListPopup/BillListPopup.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigouruku/form.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/huanyangdan/form.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/huanyangdan/table.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab2.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/quyangdan/form.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/quyangdan/table.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliaoshengdan/form.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/xiaoshouchuku/form.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/BillListPopup/BillListPopup.vue
@@ -23,7 +23,7 @@
                </view>
                <scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
                    <view class="options-wrapper" v-show="HBillList.length != 0">
                        <uni-card :is-active="bill.isActive" v-for="(bill, index) in HBillList[curPage-1]" :key="index"
                        <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''" v-for="(bill, index) in HBillList[curPage-1]" :key="index"
                            :title="bill['物料名称']" :extra="`数量: ${bill['数量']}`"
                            @tap="clickCard(bill['HSourceInterID'], bill['单据号'], index)">
                            <view class="item">
@@ -166,6 +166,7 @@
                } else {
                    this.multiSouceBillList.splice(index, 1)
                }
                console.log('this.multiSouceBillList: ',this.multiSouceBillList);
            },
            getBillList() {
                this.HBillList = []
@@ -285,7 +286,7 @@
            }
        }
        .uni-card[is-active] {
        .uni-card--is-active {
            background-color: rgba(0, 122, 255, 0.2);
        }
    }
pages.json
@@ -753,6 +753,34 @@
            "style": {
                "navigationBarTitleText": "条码生成"
            }
        },
        {
            "path" : "pages/huanyangdan/table",
            "style" :
            {
                "navigationBarTitleText" : "还样单维护"
            }
        },
        {
            "path" : "pages/huanyangdan/form",
            "style" :
            {
                "navigationBarTitleText" : "还样单"
            }
        },
        {
            "path" : "pages/quyangdan/table",
            "style" :
            {
                "navigationBarTitleText" : "取样单维护"
            }
        },
        {
            "path" : "pages/quyangdan/form",
            "style" :
            {
                "navigationBarTitleText" : "取样单"
            }
        }
    ],
    "tabBar": {
pages/caigouruku/form.vue
@@ -1191,6 +1191,7 @@
                                this.hform.HWHName_B = ''
                                this.hform.HSPName_B = ''
                            } else {
                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
@@ -1421,7 +1422,7 @@
                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform.HBillType + ';' + this.hform.HSourceBillNo
                                    try {
                                        // 为条码设置出库单号和出库次数
                                        await this.Set_BarCodeBill(sMain)
                                        // await this.Set_BarCodeBill(sMain)
                                        uni.showModal({
                                            title: '提示',
                                            content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
@@ -1591,7 +1592,7 @@
        }
        input {
            width: 100%;
            width: inherit;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }
pages/huanyangdan/form.vue
New file
@@ -0,0 +1,19 @@
<template>
    <view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
            };
        }
    }
</script>
<style lang="scss">
</style>
pages/huanyangdan/table.vue
New file
@@ -0,0 +1,22 @@
<template>
    <view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
            }
        },
        methods: {
        }
    }
</script>
<style>
</style>
pages/index/tab2.vue
@@ -216,6 +216,20 @@
                    id: 29,
                    hidden: false,
                },
                {
                    img: '../../static/icon/icon8.png',
                    text: '取样单',
                    url: '/pages/quyangdan/table',
                    id: 30,
                    hidden: !this.judgeHidden(),
                },
                {
                    img: '../../static/icon/icon8.png',
                    text: '还样单',
                    url: '/pages/huanyangdan/table',
                    id: 31,
                    hidden: !this.judgeHidden(),
                },
                // , {
                //     img: '../../static/icon/icon1.png',
                //     text: '设备档案查询',
@@ -266,6 +280,9 @@
            this.getHiddenItem()
        },
        methods: {
            judgeHidden() {
                return process.env.NODE_ENV === 'development'
            },
            async getHiddenItem() {
                let data = await getMenuList({
                    menuName: this.menuListName
pages/quyangdan/form.vue
New file
@@ -0,0 +1,22 @@
<template>
    <view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
            }
        },
        methods: {
        }
    }
</script>
<style>
</style>
pages/quyangdan/table.vue
New file
@@ -0,0 +1,36 @@
<template>
    <view>
        <view class="page-header"></view>
        <scroll-view class="page-content">
        </scroll-view>
        <!-- 分页器 -->
        <view class="page-footer"></view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                // 滚动控制
                scrollTop: 0,
                old: {
                    scrollTop: 0
                }
            }
        },
        methods: {
            goTop: function(e) {
                // 解决view层不同步的问题
                this.scrollTop = this.old.scrollTop
                this.$nextTick(function() {
                    this.scrollTop = 0
                });
            }
        }
    }
</script>
<style>
</style>
pages/shengchanlingliaoshengdan/form.vue
@@ -312,6 +312,7 @@
                reHSourceBillNo: true,
                showHSupName: true,
                barCodeFocus: false,
                HSourceFlag : false,
                tabs: 0,
                HMainSourceBillType: '生产用料清单',
@@ -398,9 +399,11 @@
                // this.btnType = 1
                this.RoadBillMain(e.HInterID)
                this.barCodeFocus = true
                this.hform.HSourceFlag = true
            } else {
                this.getNewData()
                this.HSourceBillNoFocus = true
                this.hform.HSourceFlag = true
            }
            // this.getHBaseList()
            this.getHSupList()
@@ -413,7 +416,6 @@
                console.log("接收到的消息: ", e)
                console.log("是否应用多源单: ", e.enableMultiSourceBill)
                if(e.enableMultiSourceBill){
                    for(let item of e.MultiSourceBillList) {
                        try{
                            await this.getHBarCodeData(item.HBillNo)
@@ -441,7 +443,8 @@
        computed: {
            enableMultiSourceBill: {
                get() {
                    if(uni.getStorageSync("Organization").includes("海诚") && this.hform.HMainSourceBillType ==  3720){
                    // uni.getStorageSync("Organization").includes("海诚") &&
                    if(this.hform.HMainSourceBillType ==  3720){
                        return true
                    }
                    return false
@@ -960,6 +963,7 @@
                        },
                        success: (res) => {
                            if (res.data.count == 1) {
                                this.hform.HSourceFlag = true
                                var data = res.data.data
                                console.log(2, data);
                                this.hform.HSupName = data.hSupNameField
@@ -1021,7 +1025,7 @@
                var sHQty = this.hform.HQty
                var sSourceBillNo = this.hform.HSourceBillNo
                var sSourceBillType = this.hform.HMainSourceBillType
                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
                var HSourceFlag = this.hform.HSourceFlag
                console.log(this.hform.HSourceBillNo, HSourceFlag)
                if (HDeleteFlag == "*") {
                    if (sBarCode == "") {
@@ -1120,6 +1124,7 @@
                                } else if (data.hBarTypeField == '源单条码') {
                                    this.hform.HSupName = data.hSupNameField
                                    this.hform.HSupID = data.hSupIDField
                                    this.hform.HSourceFlag = true
                                    if (data.hDeptIDField != 0) {
                                        this.hform.HDeptID = data.hDeptIDField
                                        this.hform.HDeptName = data.hDeptNameField
@@ -1329,6 +1334,7 @@
                        if (res.data.count == 1) {
                            this.hform.HInterID = res.data.data[0].HInterID
                            this.hform.HBillNo = res.data.data[0].HBillNo
                            this.hform.HSourceFlag = false
                        } else {
                            uni.showToast({
                                title: res.data.Message,
pages/xiaoshouchuku/form.vue
@@ -1224,6 +1224,7 @@
                                this.hform.HWHName_B = ''
                                this.hform.HSPName_B = ''
                            } else {
                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
@@ -1442,10 +1443,14 @@
                                console.log(1, res);
                                uni.hideLoading()
                                if (res.data.count == 1) {
                                    let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
                                        .HBillType + ';' + this.hform.HSourceBillNo
                                    try {
                                        await this.Set_BarCodeBill(sMain)
                                        if(this.hform.HMainSourceBillType == '1402') {
                                            if(/兴达|智云/.test(uni.getStorageSync('Organization'))){
                                                let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
                                                    .HBillType + ';' + this.hform.HSourceBillNo + ';兴达'
                                                this.Set_BarCodeBill(sMain)
                                            }
                                        }
                                        uni.showModal({
                                            title: '提示',
                                            content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
@@ -1504,6 +1509,10 @@
                            if (count == 1) {
                                resolve()
                            } else {
                                uni.showToast({
                                    icon:'none',
                                    title: Message
                                })
                                reject(Message)
                            }
                        }
@@ -1611,7 +1620,7 @@
        }
        input {
            width: 100%;
            width: inherit;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }