wtt
2025-10-11 db3cb0b57fdec1a8ba13ed811e12b25dad0cddb2
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
12个文件已修改
2514 ■■■■ 已修改文件
.hbuilderx/launch.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigourukujiaoyan/form.vue 981 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/caigoutuiliao/form.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/chaituosaoma/form.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab2.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliao/form.vue 695 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tiaomaguanli/table.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zutuosaoma/form.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/zutuosaoma/table.vue 507 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/common.js 228 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.hbuilderx/launch.json
@@ -25,7 +25,7 @@
            "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.shebeiguanli.www",
            "playground" : "standard",
            "playground" : "custom",
            "type" : "uni-app:app-android"
        }
    ]
manifest.json
@@ -2,6 +2,7 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.97",
    "versionCode" : 197,
    "transformPx" : false,
pages.json
@@ -815,6 +815,13 @@
            }
        },
        {
            "path" : "pages/zutuosaoma/table",
            "style" :
            {
                "navigationBarTitleText" : "组托扫码缓存"
            }
        },
        {
            "path" : "pages/chaituosaoma/form",
            "style" : 
            {
pages/caigourukujiaoyan/form.vue
@@ -312,57 +312,113 @@
                })
            },
            //扫描单据号条码
            GetMeesageByBillNo(e) {
                if(this.hform.HBillNo==""||this.hform.HBillNo==undefined){
                    return
                }
                uni.request({
                    url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                    data: {
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.hform.HBillType,
                        HMaker: this.hform.HMaker,
                        HStockOrgID: this.hform.HStockOrgID
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            CommonUtils.playSound(1);
                            var data = res.data.data
                            console.log('单据信息: ', data)
                            this.hform.HInterID = data.hInterIDField
                            this.hform.HBillNo = data.hBillNoField
                            this.showHBillNo = false
                            //条码核对标记
                            if (data.hSourceBarCodeFlagField) {
                                this.hform.HSourceBarCodeCtl = "Y"
                                this.hform.chkHBarflag = true
                                this.hform.HBarflag = data
                            }
                            this.tabs = 2
                            this.DisBillEntryList();
                            this.refreshHBarCodeFocus()
                        } else {
                            CommonUtils.playSound(0);
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                            // this.hform.HBillNo = ''
                        }
                    },
                    fail: (res) => {
                        CommonUtils.playSound(0);
            async GetMeesageByBillNo(e) {
                if (this.hform.HBillNo == "" || this.hform.HBillNo == undefined) {
                    return
                }
                try {
                    let res = await CommonUtils.doRequest2Sync({
                        url: '/WEBSController/get_BillBarCode_BillCheck_Json',
                        data: {
                            HBillNo: this.hform.HBillNo,
                            HBillType: this.hform.HBillType,
                            HMaker: this.hform.HMaker,
                            HStockOrgID: this.hform.HStockOrgID
                        },
                    })
                    if (!res) {
                        // 触发请求锁,不返回任何值
                        return
                    }
                    let {
                        data,
                        Message,
                        count
                    } = res.data
                    if (count == 1) {
                        CommonUtils.playSound(1)
                        console.log(data)
                        this.hform.HInterID = data.hInterIDField
                        this.hform.HBillNo = data.hBillNoField
                        this.showHBillNo = false
                        //条码核对标记
                        if (data.hSourceBarCodeFlagField) {
                            this.hform.HSourceBarCodeCtl = "Y"
                            this.hform.chkHBarflag = true
                            this.hform.HBarflag = data
                        }
                        this.tabs = 2
                        this.DisBillEntryList();
                        this.refreshHBarCodeFocus()
                    } else {
                        CommonUtils.playSound(0)
                        this.refreshHBillNoFocus()
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
                        uni.showToast({
                            title: Message,
                            icon: 'none'
                        })
                        this.hform.HBillNo = ''
                    }
                } catch (e) {
                    CommonUtils.playSound(0)
                    this.refreshHBillNoFocus()
                    uni.showToast({
                        title: '接口请求失败: ' + e,
                        icon: 'none'
                    })
                }
                // uni.request({
                //     url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                //     data: {
                //         HBillNo: this.hform.HBillNo,
                //         HBillType: this.hform.HBillType,
                //         HMaker: this.hform.HMaker,
                //         HStockOrgID: this.hform.HStockOrgID
                //     },
                //     success: (res) => {
                //         if (res.data.count == 1) {
                //             CommonUtils.playSound(1);
                //             var data = res.data.data
                //             console.log('单据信息: ', data)
                //             this.hform.HInterID = data.hInterIDField
                //             this.hform.HBillNo = data.hBillNoField
                //             this.showHBillNo = false
                //             //条码核对标记
                //             if (data.hSourceBarCodeFlagField) {
                //                 this.hform.HSourceBarCodeCtl = "Y"
                //                 this.hform.chkHBarflag = true
                //                 this.hform.HBarflag = data
                //             }
                //             this.tabs = 2
                //             this.DisBillEntryList();
                //             this.refreshHBarCodeFocus()
                //         } else {
                //             CommonUtils.playSound(0);
                //             this.refreshHBillNoFocus()
                //             uni.showToast({
                //                 title: res.data.Message,
                //                 icon: 'none'
                //             })
                //
                //             // this.hform.HBillNo = ''
                //         }
                //     },
                //     fail: (res) => {
                //         CommonUtils.playSound(0);
                //         this.refreshHBillNoFocus()
                //         console.log(res);
                //         uni.showToast({
                //             title: '接口请求失败',
                //             icon: 'none'
                //         })
                //     },
                // });
            },
            //基础仓库资料
            getHBaseList() {
                uni.request({
@@ -449,202 +505,377 @@
                    }
                }
            },
            getCode(HBarCode) {
                console.log(HBarCode);
                if(HBarCode==undefined||HBarCode==""){
                    return
                }
                //仓库、仓位文本框为空时,清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                var sOldBarCode = HBarCode
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
                var sHWHID = this.hform.HWHID
                var sHSPID = this.hform.HStockPlaceID
                var sHQty = this.hform.HQty
                var sSourceBillNo = this.hform.HSourceBillNo
                var sSourceBillType = this.hform.HMainSourceBillType
                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
                console.log(this.hform.HSourceBillNo, HSourceFlag)
                if (HDeleteFlag == "*") {
                    if (sBarCode == "") {
                        uni.showToast({
                            title: '请输入要删除的条码',
                            icon: 'none'
                        })
                    } else {
                        uni.request({
                            url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                            data: {
                                HInterID: this.hform.HInterID,
                                HBillType: this.hform.HBillType,
                                HBarCode: sBarCode
                            },
                            success: (res) => {
                                console.log('删除条码', res.data);
                                this.hform.HBarCode = ''
                                if (res.data.count == 1) {
                                    this.hform.HQty = ''
                                    this.DisBillEntryList()
                                } else {
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                                uni.showToast({
                                    title: '接口请求失败',
                                    icon: 'none'
                                })
                            },
                        });
                    }
                } else {
                    var sBarCode = this.hform.HBarCode
                    if (sHQty == "") {
                        sHQty = 0;
                    }
                    console.log("单据信息: ", this.hform)
                    uni.request({
                        url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                        data: {
                            sBarCode: sBarCode,
                            HBillID: this.hform.HInterID || 0,
                            HBillType: this.hform.HBillType,
                            HBillNo: this.hform.HBillNo,
                            HMaker: this.hform.HMaker,
                            HWhID: sHWHID,
                            HSPID: sHSPID,
                            HQty: sHQty,
                            // HRedBlueFlag: this.hform.HRedBlueFlag,
                            // SourceFlag: HSourceFlag,
                            // HSourceBillNo: sSourceBillNo,
                            // HSourceBillType: sSourceBillType,
                            HStockOrgID: this.hform.HStockOrgID,
                            // HScanStyle: "",
                            // HCustom1: "",
                            // HCustom2: ""
                        },
                        success: (res) => {
                            console.log('扫码返回', res.data);
                            // this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                CommonUtils.playSound(1);
                                var data = res.data.data
                                if (data.hBarTypeField == '仓库条码') {
                                    this.hform.HWHName = data.hWhNameField
                                    this.hform.HWHID = data.hWhIDField
                                    this.hform.HStockPlaceName = ''
                                    this.hform.HStockPlaceID = 0
                                    // if (data.hSPFlagField == 0) {
                                    //     this.showHStockPlaceName = false
                                    // } else {
                                    //     this.showHStockPlaceName = true
                                    // }
                                } else if (data.hBarTypeField == '仓位条码') {
                                    this.hform.HWHName = data.hWhNameField
                                    this.hform.HWHID = data.hWhIDField
                                    this.hform.HStockPlaceName = data.hSPNameField
                                    this.hform.HStockPlaceID = data.hSPIDField
                                } else if (data.hBarTypeField == '部门条码') {
                                    this.hform.HDeptName = data.hDeptNameField
                                    this.hform.HDeptID = data.hDeptIDField
                                    this.tabs = 1
                                } else if (data.hBarTypeField == '源单条码') {
                                    this.hform.HSupName = data.hSupNameField
                                    this.hform.HSupID = data.hSupIDField
                                    if (data.hDeptIDField != 0) {
                                        this.hform.HDeptID = data.hDeptIDField
                                        this.hform.HDeptName = data.hDeptNameField
                                    }
                                    this.hform.HSourceBillNo = data.hSourceBillNoField
                                    //获取源单类型、源单单号
                                    if (data.hSourceBillTypeField == "1103") {
                                        this.HMainSourceBillType = '收料通知单'
                                        this.hform.HMainSourceBillType = 1103
                                        this.showHMainSourceBillType = false
                                    } else if (data.hSourceBillTypeField == "1102") {
                                        this.HMainSourceBillType = '采购订单'
                                        this.hform.HMainSourceBillType = 1102
                                        this.showHMainSourceBillType = false
                                    } else {
                                        this.HMainSourceBillType = '手工录入'
                                        this.hform.HMainSourceBillType = -1
                                        this.showHMainSourceBillType = false
                                    }
                                    if (data.hMulSourceFlagField == 0) {
                                        this.showHSourceBillNo = false
                                    }
                                    //供应商不可编辑
                                    this.showHSupName = false
                                    this.tabs = 2
                                } else { //物料条码
                                    this.tabs = 2
                                    if (!this.hform.HSourceBillNo) {
                                        this.hform.HSupName = data.hSupNameField
                                        this.hform.HSupID = data.hSupIDField
                                        this.hform.HSourceBillNo = data.hSourceBillNoField
                                        if (data.hDeptIDField != 0) {
                                            this.hform.HDeptID = data.hDeptIDField
                                            this.hform.HDeptName = data.hDeptNameField
                                        }
                                        console.log(data)
                                        //获取源单类型、源单单号
                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
                                        if (data.hSourceBillTypeField == "1103") {
                                            this.HMainSourceBillType = '收料通知单'
                                            this.hform.HMainSourceBillType = 1103
                                            this.showHMainSourceBillType = false
                                        } else if (data.hSourceBillTypeField == "1102") {
                                            this.HMainSourceBillType = '采购订单'
                                            this.hform.HMainSourceBillType = 1102
                                            this.showHMainSourceBillType = false
                                        } else {
                                            this.HMainSourceBillType = '手工录入'
                                            this.hform.HMainSourceBillType = -1
                                            this.showHMainSourceBillType = false
                                        }
                                        if (data.hMulSourceFlagField == 0) {
                                            this.showHSourceBillNo = false
                                        }
                                        //供应商不可编辑
                                        this.showHSupName = false
                                    }
                                }
                                //显示表体明细
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                            } else {
                                CommonUtils.playSound(0);
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                            this.refreshHBarCodeFocus()
                        },
                        fail: (res) => {
                            CommonUtils.playSound(0);
                            console.log(res);
                            this.refreshHBarCodeFocus()
                            uni.showToast({
                                title: '接口请求失败',
                                icon: 'none'
                            })
                        },
                    });
                }
            //扫条码处理
            async getCode(HBarCode) {
                if (HBarCode == undefined || HBarCode == "") {
                    return
                }
                //仓库、仓位文本框为空时,清空对应ID
                if (!this.hform.HWHName) {
                    this.hform.HWHID = 0
                }
                if (!this.hform.HStockPlaceName) {
                    this.hform.HStockPlaceID = 0
                }
                var sOldBarCode = HBarCode
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
                var sHWHID = this.hform.HWHID
                var sHSPID = this.hform.HStockPlaceID
                var sHQty = this.hform.HQty
                var sSourceBillNo = this.hform.HSourceBillNo
                var sSourceBillType = this.hform.HMainSourceBillType
                var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
                console.log(this.hform.HSourceBillNo, HSourceFlag)
                if (HDeleteFlag == "*") {
                    if (sBarCode == "") {
                        uni.showToast({
                            title: '请输入要删除的条码',
                            icon: 'none'
                        })
                    } else {
                        try {
                            let res = await CommonUtils.doRequest2Sync({
                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                                data: {
                                    HInterID: this.hform.HInterID,
                                    HBillType: this.hform.HBillType,
                                    HBarCode: sBarCode
                                },
                            })
                            if (!res) {
                                // 请求被锁定,退出当前请求
                                return
                            }
                            console.log('删除条码', res.data);
                            this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                this.hform.HQty = ''
                                this.DisBillEntryList()
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                        } catch (e) {
                            CommonUtils.playSound(0)
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: '接口请求失败: ' + e,
                                icon: 'none'
                            })
                        }
                        // uni.request({
                        //     url: this.serverUrl +
                        //         '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                        //     data: {
                        //         HInterID: this.hform.HInterID,
                        //         HBillType: this.hform.HBillType,
                        //         HBarCode: sBarCode
                        //     },
                        //     success: (res) => {
                        //         console.log('删除条码', res.data);
                        //         this.hform.HBarCode = ''
                        //         if (res.data.count == 1) {
                        //             this.hform.HQty = ''
                        //             this.DisBillEntryList()
                        //         } else {
                        //             uni.showToast({
                        //                 title: res.data.Message,
                        //                 icon: 'none'
                        //             })
                        //         }
                        //     },
                        //     fail: (res) => {
                        //         console.log(res);
                        //         uni.showToast({
                        //             title: '接口请求失败',
                        //             icon: 'none'
                        //         })
                        //     },
                        // });
                    }
                } else {
                    var sBarCode = this.hform.HBarCode
                    if (sHQty == "") {
                        sHQty = 0;
                    }
                    try {
                        let res = await CommonUtils.doRequest2Sync({
                            url: '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                            data: {
                                sBarCode: sBarCode,
                                HBillID: this.hform.HInterID || 0,
                                HBillType: this.hform.HBillType,
                                HBillNo: this.hform.HBillNo,
                                HMaker: this.hform.HMaker,
                                HWhID: sHWHID,
                                HSPID: sHSPID,
                                HQty: sHQty,
                                // HRedBlueFlag: this.hform.HRedBlueFlag,
                                // SourceFlag: HSourceFlag,
                                // HSourceBillNo: sSourceBillNo,
                                // HSourceBillType: sSourceBillType,
                                HStockOrgID: this.hform.HStockOrgID,
                                // HScanStyle: "",
                                // HCustom1: "",
                                // HCustom2: ""
                            },
                        })
                        if (!res) {
                            return
                        }
                        console.log('扫码返回', res.data);
                        this.hform.HBarCode = ''
                        if (res.data.count == 1) {
                            CommonUtils.playSound(1);
                            var data = res.data.data
                            if (data.hBarTypeField == '仓库条码') {
                                this.hform.HWHName = data.hWhNameField
                                this.hform.HWHID = data.hWhIDField
                                this.hform.HStockPlaceName = ''
                                this.hform.HStockPlaceID = 0
                                if (data.hSPFlagField == 0) {
                                    this.showHStockPlaceName = false
                                } else {
                                    this.showHStockPlaceName = true
                                }
                            } else if (data.hBarTypeField == '仓位条码') {
                                this.hform.HWHName = data.hWhNameField
                                this.hform.HWHID = data.hWhIDField
                                this.hform.HStockPlaceName = data.hSPNameField
                                this.hform.HStockPlaceID = data.hSPIDField
                            } else if (data.hBarTypeField == '部门条码') {
                                this.hform.HDeptName = data.hDeptNameField
                                this.hform.HDeptID = data.hDeptIDField
                                this.tabs = 1
                            } else if (data.hBarTypeField == '源单条码') {
                                this.hform.HSupName = data.hSupNameField
                                this.hform.HSupID = data.hSupIDField
                                if (data.hDeptIDField != 0) {
                                    this.hform.HDeptID = data.hDeptIDField
                                    this.hform.HDeptName = data.hDeptNameField
                                }
                                this.hform.HSourceBillNo = data.hSourceBillNoField
                                //获取源单类型、源单单号
                                if (data.hSourceBillTypeField == "1103") {
                                    this.HMainSourceBillType = '收料通知单'
                                    this.hform.HMainSourceBillType = 1103
                                    this.showHMainSourceBillType = false
                                } else if (data.hSourceBillTypeField == "1102") {
                                    this.HMainSourceBillType = '采购订单'
                                    this.hform.HMainSourceBillType = 1102
                                    this.showHMainSourceBillType = false
                                } else {
                                    this.HMainSourceBillType = '手工录入'
                                    this.hform.HMainSourceBillType = -1
                                    this.showHMainSourceBillType = false
                                }
                                if (data.hMulSourceFlagField == 0) {
                                    this.showHSourceBillNo = false
                                }
                                //供应商不可编辑
                                this.showHSupName = false
                                this.tabs = 2
                            } else { //物料条码
                                this.tabs = 2
                                console.log('data', data)
                                if (!this.hform.HSourceBillNo) {
                                    this.hform.HSupName = data.hSupNameField
                                    this.hform.HSupID = data.hSupIDField
                                    this.hform.HSourceBillNo = data.hSourceBillNoField
                                    if (data.hDeptIDField != 0) {
                                        this.hform.HDeptID = data.hDeptIDField
                                        this.hform.HDeptName = data.hDeptNameField
                                    }
                                    //获取源单类型、源单单号
                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
                                    if (data.hSourceBillTypeField == "1103") {
                                        this.HMainSourceBillType = '收料通知单'
                                        this.hform.HMainSourceBillType = 1103
                                        this.showHMainSourceBillType = false
                                    } else if (data.hSourceBillTypeField == "1102") {
                                        this.HMainSourceBillType = '采购订单'
                                        this.hform.HMainSourceBillType = 1102
                                        this.showHMainSourceBillType = false
                                    } else {
                                        this.HMainSourceBillType = '手工录入'
                                        this.hform.HMainSourceBillType = -1
                                        this.showHMainSourceBillType = false
                                    }
                                    if (data.hMulSourceFlagField == 0) {
                                        this.showHSourceBillNo = false
                                    }
                                    //供应商不可编辑
                                    this.showHSupName = false
                                }
                            }
                            //显示表体明细
                            this.DisBillEntryList()
                            //清空数量
                            this.hform.HQty = ''
                        } else {
                            CommonUtils.playSound(0);
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        this.refreshHBarCodeFocus()
                    } catch (e) {
                        CommonUtils.playSound(0)
                        this.refreshHBillNoFocus()
                        uni.showToast({
                            title: '接口请求失败: ' + e,
                            icon: 'none'
                        })
                    }
                    // uni.request({
                    //     url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                    //     data: {
                    //         sBarCode: sBarCode,
                    //         HBillID: this.hform.HInterID || 0,
                    //         HBillType: this.hform.HBillType,
                    //         HBillNo: this.hform.HBillNo,
                    //         HMaker: this.hform.HMaker,
                    //         HWhID: sHWHID,
                    //         HSPID: sHSPID,
                    //         HQty: sHQty,
                    //         // HRedBlueFlag: this.hform.HRedBlueFlag,
                    //         // SourceFlag: HSourceFlag,
                    //         // HSourceBillNo: sSourceBillNo,
                    //         // HSourceBillType: sSourceBillType,
                    //         HStockOrgID: this.hform.HStockOrgID,
                    //         // HScanStyle: "",
                    //         // HCustom1: "",
                    //         // HCustom2: ""
                    //     },
                    //     success: (res) => {
                    //         console.log('扫码返回', res.data);
                    //         this.hform.HBarCode = ''
                    //         if (res.data.count == 1) {
                    //             CommonUtils.playSound(1);
                    //             var data = res.data.data
                    //             if (data.hBarTypeField == '仓库条码') {
                    //                 this.hform.HWHName = data.hWhNameField
                    //                 this.hform.HWHID = data.hWhIDField
                    //                 this.hform.HStockPlaceName = ''
                    //                 this.hform.HStockPlaceID = 0
                    //                 if (data.hSPFlagField == 0) {
                    //                     this.showHStockPlaceName = false
                    //                 } else {
                    //                     this.showHStockPlaceName = true
                    //                 }
                    //             } else if (data.hBarTypeField == '仓位条码') {
                    //                 this.hform.HWHName = data.hWhNameField
                    //                 this.hform.HWHID = data.hWhIDField
                    //                 this.hform.HStockPlaceName = data.hSPNameField
                    //                 this.hform.HStockPlaceID = data.hSPIDField
                    //             } else if (data.hBarTypeField == '部门条码') {
                    //                 this.hform.HDeptName = data.hDeptNameField
                    //                 this.hform.HDeptID = data.hDeptIDField
                    //                 this.tabs = 1
                    //             } else if (data.hBarTypeField == '源单条码') {
                    //                 this.hform.HSupName = data.hSupNameField
                    //                 this.hform.HSupID = data.hSupIDField
                    //                 if (data.hDeptIDField != 0) {
                    //                     this.hform.HDeptID = data.hDeptIDField
                    //                     this.hform.HDeptName = data.hDeptNameField
                    //                 }
                    //                 this.hform.HSourceBillNo = data.hSourceBillNoField
                    //                 //获取源单类型、源单单号
                    //                 if (data.hSourceBillTypeField == "1103") {
                    //                     this.HMainSourceBillType = '收料通知单'
                    //                     this.hform.HMainSourceBillType = 1103
                    //                     this.showHMainSourceBillType = false
                    //                 } else if (data.hSourceBillTypeField == "1102") {
                    //                     this.HMainSourceBillType = '采购订单'
                    //                     this.hform.HMainSourceBillType = 1102
                    //                     this.showHMainSourceBillType = false
                    //                 } else {
                    //                     this.HMainSourceBillType = '手工录入'
                    //                     this.hform.HMainSourceBillType = -1
                    //                     this.showHMainSourceBillType = false
                    //                 }
                    //                 if (data.hMulSourceFlagField == 0) {
                    //                     this.showHSourceBillNo = false
                    //                 }
                    //                 //供应商不可编辑
                    //                 this.showHSupName = false
                    //                 this.tabs = 2
                    //             } else { //物料条码
                    //                 this.tabs = 2
                    //                 console.log('data', data)
                    //                 if (!this.hform.HSourceBillNo) {
                    //                     this.hform.HSupName = data.hSupNameField
                    //                     this.hform.HSupID = data.hSupIDField
                    //                     this.hform.HSourceBillNo = data.hSourceBillNoField
                    //                     if (data.hDeptIDField != 0) {
                    //                         this.hform.HDeptID = data.hDeptIDField
                    //                         this.hform.HDeptName = data.hDeptNameField
                    //                     }
                    //                     //获取源单类型、源单单号
                    //                     this.hform.HMainSourceBillType = data.hSourceBillTypeField
                    //                     if (data.hSourceBillTypeField == "1103") {
                    //                         this.HMainSourceBillType = '收料通知单'
                    //                         this.hform.HMainSourceBillType = 1103
                    //                         this.showHMainSourceBillType = false
                    //                     } else if (data.hSourceBillTypeField == "1102") {
                    //                         this.HMainSourceBillType = '采购订单'
                    //                         this.hform.HMainSourceBillType = 1102
                    //                         this.showHMainSourceBillType = false
                    //                     } else {
                    //                         this.HMainSourceBillType = '手工录入'
                    //                         this.hform.HMainSourceBillType = -1
                    //                         this.showHMainSourceBillType = false
                    //                     }
                    //                     if (data.hMulSourceFlagField == 0) {
                    //                         this.showHSourceBillNo = false
                    //                     }
                    //                     //供应商不可编辑
                    //                     this.showHSupName = false
                    //                 }
                    //             }
                    //             //显示表体明细
                    //             this.DisBillEntryList()
                    //             //清空数量
                    //             this.hform.HQty = ''
                    //         } else {
                    //             CommonUtils.playSound(0);
                    //             uni.showToast({
                    //                 title: res.data.Message,
                    //                 icon: 'none'
                    //             })
                    //         }
                    //
                    //         this.refreshHBarCodeFocus()
                    //     },
                    //     fail: (res) => {
                    //         CommonUtils.playSound(0);
                    //         console.log(res);
                    //         uni.showToast({
                    //             title: '接口请求失败',
                    //             icon: 'none'
                    //         })
                    //
                    //         this.refreshHBarCodeFocus()
                    //     },
                    // });
                }
            },
            //物料信息
            DisBillEntryList() {
@@ -736,91 +967,179 @@
                    }
                });
            },
            submit() {
                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描单据条码!',
                        icon: 'none'
                    })
                } else if (!this.hform.HBillNo) {
                    uni.showToast({
                        title: '单据号获取失败,错误的单据号!',
                        icon: 'none'
                    })
                } else if (!this.Materlist || this.Materlist.length == 0) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描条码,确认无误后再提交!',
                        icon: 'none'
                    })
                } else {
                    var s = 0;
                    for (var i = 0; i < this.Materlist.length; i++) {
                        if (this.Materlist[i].数量 > 0) {
                            s = 1;
                        }
                    }
                    if (s == 0) {
                        uni.showToast({
                            title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
                            icon: 'none'
                        })
                    } else {
                        uni.showLoading({
                            title: '请稍候'
                        })
                        var sMainStr = JSON.stringify(this.hform);
                        uni.request({
                            url: this.serverUrl + '/WEBSController/set_SavePOStockInBill_BillCheck_Json',
                            method: 'POST',
                            dataType: "json",
                            data: {
                                oMain: sMainStr
                            },
                            success: (res) => {
                                console.log(1, res);
                                uni.hideLoading()
                                if (res.data.count == 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url: '/pages/caigourukujiaoyan/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(() => {
                                                    uni.navigateBack();
                                                }, 50)
                                            }
                                        }
                                    });
                                } else {
                                    // uni.showToast({
                                    //     title: res.data.Message,
                                    //     icon: 'none'
                                    // })
                                    uni.showModal({
                                        title: '温馨提示',
                                        content: res.data.Message,
                                        showCancel: false
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                                uni.showToast({
                                    title: '接口请求失败',
                                    icon: 'none'
                                })
                            },
                        });
                    }
                }
            },
            async submit() {
                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描单据条码!',
                        icon: 'none'
                    })
                } else if (!this.hform.HBillNo) {
                    uni.showToast({
                        title: '单据号获取失败,错误的单据号!',
                        icon: 'none'
                    })
                } else if (!this.Materlist || this.Materlist.length == 0) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描条码,确认无误后再提交!',
                        icon: 'none'
                    })
                } else {
                    var s = 0;
                    for (var i = 0; i < this.Materlist.length; i++) {
                        if (this.Materlist[i].数量 > 0) {
                            s = 1;
                        }
                    }
                    // if (s == 0) {
                    //     uni.showToast({
                    //         title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
                    //         icon: 'none'
                    //     })
                    // } else
                    {
                        uni.showLoading({
                            title: '请稍候'
                        })
                        var sMainStr = JSON.stringify(this.hform);
                        try {
                            let res = await CommonUtils.doRequest2Sync({
                                url: '/WEBSController/set_SavePOStockInBill_BillCheck_Json',
                                method: 'POST',
                                data: {
                                    oMain: sMainStr
                                },
                            })
                            if(!res) {
                                return
                            }
                            console.log(1, res);
                            uni.hideLoading()
                            if (res.data.count == 1) {
                                uni.showModal({
                                    title: '提示',
                                    content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                    success: (res) => {
                                        if (res.confirm) {
                                            console.log('用户点击确定');
                                            uni.redirectTo({
                                                url: '/pages/caigourukujiaoyan/form?OperationType=1'
                                            })
                                        } else if (res.cancel) {
                                            console.log('用户点击取消');
                                            setTimeout(() => {
                                                uni.navigateBack();
                                            }, 50)
                                        }
                                    }
                                });
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                        } catch (e) {
                            CommonUtils.playSound(0)
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: '接口请求失败: ' + e,
                                icon: 'none'
                            })
                        }
                    }
                }
            },
            // submit() {
            //     if (this.hform.HInterID == 0 || !this.hform.HInterID) {
            //         uni.showToast({
            //             title: '没有扫码信息,请先扫描单据条码!',
            //             icon: 'none'
            //         })
            //     } else if (!this.hform.HBillNo) {
            //         uni.showToast({
            //             title: '单据号获取失败,错误的单据号!',
            //             icon: 'none'
            //         })
            //     } else if (!this.Materlist || this.Materlist.length == 0) {
            //         uni.showToast({
            //             title: '没有扫码信息,请先扫描条码,确认无误后再提交!',
            //             icon: 'none'
            //         })
            //     } else {
            //         var s = 0;
            //         for (var i = 0; i < this.Materlist.length; i++) {
            //             if (this.Materlist[i].数量 > 0) {
            //                 s = 1;
            //             }
            //         }
            //         if (s == 0) {
            //             uni.showToast({
            //                 title: '没有扫描物料条码,请先扫描物料条码,确认无误后再提交!',
            //                 icon: 'none'
            //             })
            //         } else {
            //             uni.showLoading({
            //                 title: '请稍候'
            //             })
            //             var sMainStr = JSON.stringify(this.hform);
            //             uni.request({
            //                 url: this.serverUrl + '/WEBSController/set_SavePOStockInBill_BillCheck_Json',
            //                 method: 'POST',
            //                 dataType: "json",
            //                 data: {
            //                     oMain: sMainStr
            //                 },
            //                 success: (res) => {
            //                     console.log(1, res);
            //                     uni.hideLoading()
            //                     if (res.data.count == 1) {
            //                         uni.showModal({
            //                             title: '提示',
            //                             content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
            //                             success: (res) => {
            //                                 if (res.confirm) {
            //                                     console.log('用户点击确定');
            //                                     uni.redirectTo({
            //                                         url: '/pages/caigourukujiaoyan/form?OperationType=1'
            //                                     })
            //                                 } else if (res.cancel) {
            //                                     console.log('用户点击取消');
            //                                     setTimeout(() => {
            //                                         uni.navigateBack();
            //                                     }, 50)
            //                                 }
            //                             }
            //                         });
            //                     } else {
            //                         // uni.showToast({
            //                         //     title: res.data.Message,
            //                         //     icon: 'none'
            //                         // })
            //
            //                         uni.showModal({
            //                             title: '温馨提示',
            //                             content: res.data.Message,
            //                             showCancel: false
            //                         })
            //                     }
            //                 },
            //                 fail: (res) => {
            //                     console.log(res);
            //                     uni.showToast({
            //                         title: '接口请求失败',
            //                         icon: 'none'
            //                     })
            //                 },
            //             });
            //         }
            //     }
            // },
            goBack() {
                uni.showModal({
pages/caigoutuiliao/form.vue
@@ -244,7 +244,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>
@@ -262,11 +264,14 @@
    } from '../../utils/userRelationManager';
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
    export default {
        components: {
            BillListPopupVue,
            BarCodePopupVue
            BarCodePopupVue,
            BillSelectPopupXiaoWeiVue
        },
        data() {
            return {
                HSourceBillNoFocus: false,
@@ -355,6 +360,20 @@
            }
        },
        computed: {
            enableModule: {
                get() {
                    if (this.hform.HMainSourceBillType == 1201 &&
                        /小卫|智云/.test(uni.getStorageSync('Organization'))
                    ) {
                        return 1
                    } else {
                        return 2
                    }
                }
                // 其他条件
            },
            HStockPlaceNameListComputed: {
                get() {
                    // 动态计算对应仓库的仓位
pages/chaituosaoma/form.vue
@@ -2,7 +2,7 @@
    <view class="form">
        <view class="form-base-info">
            <view class="form-item">
                <view class="title">箱条码</view>
                <view class="title">托条码</view>
                <view class="right">
                    <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack" @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
                </view>
@@ -80,7 +80,7 @@
            </view>
        </view>
        <view class="bottom-btn" id="bottom-btn">
            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">拆箱</button>
            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">拆托</button>
            <view style="flex: 1;"></view>
            <!-- <button class="btn-d" size="mini" @tap="cmdDelete">删除</button> -->
            <button class="btn-c" size="mini" @tap="cmdExit">退出</button>
@@ -195,10 +195,10 @@
            GetMeesageByBarCode_Pack(HBarCode_Pack) {
                // 获取托条码对应的数据
                CommonUtils.doRequest2({
                    url: '/WEBSController/Get_PackBarCode_UnPackUnionBill_Json',
                    url: '/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json',
                    data: {
                        HBillSubType: this.HBillSubType,
                        HMaker: this.hform.HMaker,
                        HStockOrgID: this.hform.HStockOrgID,
                        HBarCode_Pack: HBarCode_Pack
                    },
                    resFunction: (res) => {
@@ -465,7 +465,7 @@
                }
                this.EnableSubmit = false
                CommonUtils.doRequest2({
                    url: '/WEBSController/set_SaveUnPackUnionBill_Json',
                    url: '/WEBSController/GetDeletePackUnionBill_Json',
                    data: {
                        "HInterID": this.hform.HInterID,
                        "HBillNo": this.hform.HBillNo,
pages/index/tab2.vue
@@ -244,6 +244,12 @@
                    url: `/pages/shengchantuiliao/table`,
                    id: 33,
                    hidden: false,
                },{
                    img: '../../static/icon/icon8.png',
                    text: '组脱单暂存列表',
                    url: `/pages/zutuosaoma/table`,
                    id: 34,
                    hidden: false,
                }
                // {
                //     img: '../../static/icon/icon8.png',
pages/shengchanlingliao/form.vue
@@ -5,7 +5,7 @@
                <view class="title">条码:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="请扫描(或输入)条码"
                         @blur="getCode(hform.HBarCode)" />
                        @blur="getCode(hform.HBarCode)" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -46,7 +46,7 @@
                    <view class="title">单据号:</view>
                    <view class="right" style="width: 380rpx;">
                        <input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="请扫描(或输入)条码"
                             @blur="GetMeesageByBillNo()" />
                            @blur="GetMeesageByBillNo()" />
                    </view>
                    <uni-icons type="scan"
                        style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -393,55 +393,110 @@
                })
            },
            //扫描单据号条码
            GetMeesageByBillNo(e) {
            async GetMeesageByBillNo(e) {
                if (this.hform.HBillNo == "" || this.hform.HBillNo == undefined) {
                    return
                }
                uni.request({
                    url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                    data: {
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.hform.HBillType,
                        HMaker: this.hform.HMaker,
                        HStockOrgID: this.hform.HStockOrgID
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.playSound(1)
                            var data = res.data.data
                            console.log(data)
                            this.hform.HInterID = data.hInterIDField
                            this.hform.HBillNo = data.hBillNoField
                            this.showHBillNo = false
                            //条码核对标记
                            if (data.hSourceBarCodeFlagField) {
                                this.hform.HSourceBarCodeCtl = "Y"
                                this.hform.chkHBarflag = true
                                this.hform.HBarflag = data
                            }
                            this.tabs = 2
                            this.DisBillEntryList();
                            this.refreshHBarCodeFocus()
                        } else {
                            this.playSound(0)
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                            this.hform.HBillNo = ''
                try {
                    let res = await CommonUtils.doRequest2Sync({
                        url: '/WEBSController/get_BillBarCode_BillCheck_Json',
                        data: {
                            HBillNo: this.hform.HBillNo,
                            HBillType: this.hform.HBillType,
                            HMaker: this.hform.HMaker,
                            HStockOrgID: this.hform.HStockOrgID
                        },
                    })
                    if (!res) {
                        // 触发请求锁,不返回任何值
                        return
                    }
                    let {
                        data,
                        Message,
                        count
                    } = res.data
                    if (count == 1) {
                        this.playSound(1)
                        console.log(data)
                        this.hform.HInterID = data.hInterIDField
                        this.hform.HBillNo = data.hBillNoField
                        this.showHBillNo = false
                        //条码核对标记
                        if (data.hSourceBarCodeFlagField) {
                            this.hform.HSourceBarCodeCtl = "Y"
                            this.hform.chkHBarflag = true
                            this.hform.HBarflag = data
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        this.tabs = 2
                        this.DisBillEntryList();
                        this.refreshHBarCodeFocus()
                    } else {
                        this.playSound(0)
                        this.refreshHBillNoFocus()
                        uni.showToast({
                            title: '接口请求失败',
                            title: Message,
                            icon: 'none'
                        })
                    },
                });
                        this.hform.HBillNo = ''
                    }
                } catch (e) {
                    this.playSound(0)
                    this.refreshHBillNoFocus()
                    uni.showToast({
                        title: '接口请求失败: ' + e,
                        icon: 'none'
                    })
                }
                // uni.request({
                //     url: this.serverUrl + '/WEBSController/get_BillBarCode_BillCheck_Json',
                //     data: {
                //         HBillNo: this.hform.HBillNo,
                //         HBillType: this.hform.HBillType,
                //         HMaker: this.hform.HMaker,
                //         HStockOrgID: this.hform.HStockOrgID
                //     },
                //     success: (res) => {
                //         if (res.data.count == 1) {
                //             this.playSound(1)
                //             var data = res.data.data
                //             console.log(data)
                //             this.hform.HInterID = data.hInterIDField
                //             this.hform.HBillNo = data.hBillNoField
                //             this.showHBillNo = false
                //             //条码核对标记
                //             if (data.hSourceBarCodeFlagField) {
                //                 this.hform.HSourceBarCodeCtl = "Y"
                //                 this.hform.chkHBarflag = true
                //                 this.hform.HBarflag = data
                //             }
                //             this.tabs = 2
                //             this.DisBillEntryList();
                //             this.refreshHBarCodeFocus()
                //         } else {
                //             this.playSound(0)
                //             this.refreshHBillNoFocus()
                //             uni.showToast({
                //                 title: res.data.Message,
                //                 icon: 'none'
                //             })
                //             this.hform.HBillNo = ''
                //         }
                //     },
                //     fail: (res) => {
                //         console.log(res);
                //         this.playSound(0)
                //         this.refreshHBillNoFocus()
                //         uni.showToast({
                //             title: '接口请求失败',
                //             icon: 'none'
                //         })
                //     },
                // });
            },
            //基础仓库资料
            getHBaseList() {
@@ -528,7 +583,7 @@
                }
            },
            //扫条码处理
            getCode(HBarCode) {
            async getCode(HBarCode) {
                if (HBarCode == undefined || HBarCode == "") {
                    return
                }
@@ -557,95 +612,172 @@
                            icon: 'none'
                        })
                    } else {
                        uni.request({
                            url: this.serverUrl +
                                '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                            data: {
                                HInterID: this.hform.HInterID,
                                HBillType: this.hform.HBillType,
                                HBarCode: sBarCode
                            },
                            success: (res) => {
                                console.log('删除条码', res.data);
                                this.hform.HBarCode = ''
                                if (res.data.count == 1) {
                                    this.hform.HQty = ''
                                    this.DisBillEntryList()
                                } else {
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                        try {
                            let res = await CommonUtils.doRequest2Sync({
                                url: '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                                data: {
                                    HInterID: this.hform.HInterID,
                                    HBillType: this.hform.HBillType,
                                    HBarCode: sBarCode
                                },
                            })
                            if (!res) {
                                // 请求被锁定,退出当前请求
                                return
                            }
                            console.log('删除条码', res.data);
                            this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                this.hform.HQty = ''
                                this.DisBillEntryList()
                            } else {
                                uni.showToast({
                                    title: '接口请求失败',
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            },
                        });
                            }
                        } catch (e) {
                            this.playSound(0)
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: '接口请求失败: ' + e,
                                icon: 'none'
                            })
                        }
                        // uni.request({
                        //     url: this.serverUrl +
                        //         '/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json',
                        //     data: {
                        //         HInterID: this.hform.HInterID,
                        //         HBillType: this.hform.HBillType,
                        //         HBarCode: sBarCode
                        //     },
                        //     success: (res) => {
                        //         console.log('删除条码', res.data);
                        //         this.hform.HBarCode = ''
                        //         if (res.data.count == 1) {
                        //             this.hform.HQty = ''
                        //             this.DisBillEntryList()
                        //         } else {
                        //             uni.showToast({
                        //                 title: res.data.Message,
                        //                 icon: 'none'
                        //             })
                        //         }
                        //     },
                        //     fail: (res) => {
                        //         console.log(res);
                        //         uni.showToast({
                        //             title: '接口请求失败',
                        //             icon: 'none'
                        //         })
                        //     },
                        // });
                    }
                } else {
                    var sBarCode = this.hform.HBarCode
                    if (sHQty == "") {
                        sHQty = 0;
                    }
                    uni.request({
                        url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                        data: {
                            sBarCode: sBarCode,
                            HBillID: this.hform.HInterID || 0,
                            HBillType: this.hform.HBillType,
                            HBillNo: this.hform.HBillNo,
                            HMaker: this.hform.HMaker,
                            HWhID: sHWHID,
                            HSPID: sHSPID,
                            HQty: sHQty,
                            // HRedBlueFlag: this.hform.HRedBlueFlag,
                            // SourceFlag: HSourceFlag,
                            // HSourceBillNo: sSourceBillNo,
                            // HSourceBillType: sSourceBillType,
                            HStockOrgID: this.hform.HStockOrgID,
                            // HScanStyle: "",
                            // HCustom1: "",
                            // HCustom2: ""
                        },
                        success: (res) => {
                            console.log('扫码返回', res.data);
                            this.hform.HBarCode = ''
                            if (res.data.count == 1) {
                                CommonUtils.playSound(1);
                                var data = res.data.data
                                if (data.hBarTypeField == '仓库条码') {
                                    this.hform.HWHName = data.hWhNameField
                                    this.hform.HWHID = data.hWhIDField
                                    this.hform.HStockPlaceName = ''
                                    this.hform.HStockPlaceID = 0
                                    if (data.hSPFlagField == 0) {
                                        this.showHStockPlaceName = false
                                    } else {
                                        this.showHStockPlaceName = true
                                    }
                                } else if (data.hBarTypeField == '仓位条码') {
                                    this.hform.HWHName = data.hWhNameField
                                    this.hform.HWHID = data.hWhIDField
                                    this.hform.HStockPlaceName = data.hSPNameField
                                    this.hform.HStockPlaceID = data.hSPIDField
                                } else if (data.hBarTypeField == '部门条码') {
                                    this.hform.HDeptName = data.hDeptNameField
                    try {
                        let res = await CommonUtils.doRequest2Sync({
                            url: '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                            data: {
                                sBarCode: sBarCode,
                                HBillID: this.hform.HInterID || 0,
                                HBillType: this.hform.HBillType,
                                HBillNo: this.hform.HBillNo,
                                HMaker: this.hform.HMaker,
                                HWhID: sHWHID,
                                HSPID: sHSPID,
                                HQty: sHQty,
                                // HRedBlueFlag: this.hform.HRedBlueFlag,
                                // SourceFlag: HSourceFlag,
                                // HSourceBillNo: sSourceBillNo,
                                // HSourceBillType: sSourceBillType,
                                HStockOrgID: this.hform.HStockOrgID,
                                // HScanStyle: "",
                                // HCustom1: "",
                                // HCustom2: ""
                            },
                        })
                        if (!res) {
                            return
                        }
                        console.log('扫码返回', res.data);
                        this.hform.HBarCode = ''
                        if (res.data.count == 1) {
                            CommonUtils.playSound(1);
                            var data = res.data.data
                            if (data.hBarTypeField == '仓库条码') {
                                this.hform.HWHName = data.hWhNameField
                                this.hform.HWHID = data.hWhIDField
                                this.hform.HStockPlaceName = ''
                                this.hform.HStockPlaceID = 0
                                if (data.hSPFlagField == 0) {
                                    this.showHStockPlaceName = false
                                } else {
                                    this.showHStockPlaceName = true
                                }
                            } else if (data.hBarTypeField == '仓位条码') {
                                this.hform.HWHName = data.hWhNameField
                                this.hform.HWHID = data.hWhIDField
                                this.hform.HStockPlaceName = data.hSPNameField
                                this.hform.HStockPlaceID = data.hSPIDField
                            } else if (data.hBarTypeField == '部门条码') {
                                this.hform.HDeptName = data.hDeptNameField
                                this.hform.HDeptID = data.hDeptIDField
                                this.tabs = 1
                            } else if (data.hBarTypeField == '源单条码') {
                                this.hform.HSupName = data.hSupNameField
                                this.hform.HSupID = data.hSupIDField
                                if (data.hDeptIDField != 0) {
                                    this.hform.HDeptID = data.hDeptIDField
                                    this.tabs = 1
                                } else if (data.hBarTypeField == '源单条码') {
                                    this.hform.HDeptName = data.hDeptNameField
                                }
                                this.hform.HSourceBillNo = data.hSourceBillNoField
                                //获取源单类型、源单单号
                                if (data.hSourceBillTypeField == "1103") {
                                    this.HMainSourceBillType = '收料通知单'
                                    this.hform.HMainSourceBillType = 1103
                                    this.showHMainSourceBillType = false
                                } else if (data.hSourceBillTypeField == "1102") {
                                    this.HMainSourceBillType = '采购订单'
                                    this.hform.HMainSourceBillType = 1102
                                    this.showHMainSourceBillType = false
                                } else {
                                    this.HMainSourceBillType = '手工录入'
                                    this.hform.HMainSourceBillType = -1
                                    this.showHMainSourceBillType = false
                                }
                                if (data.hMulSourceFlagField == 0) {
                                    this.showHSourceBillNo = false
                                }
                                //供应商不可编辑
                                this.showHSupName = false
                                this.tabs = 2
                            } else { //物料条码
                                this.tabs = 2
                                console.log('data', data)
                                if (!this.hform.HSourceBillNo) {
                                    this.hform.HSupName = data.hSupNameField
                                    this.hform.HSupID = data.hSupIDField
                                    this.hform.HSourceBillNo = data.hSourceBillNoField
                                    if (data.hDeptIDField != 0) {
                                        this.hform.HDeptID = data.hDeptIDField
                                        this.hform.HDeptName = data.hDeptNameField
                                    }
                                    this.hform.HSourceBillNo = data.hSourceBillNoField
                                    //获取源单类型、源单单号
                                    this.hform.HMainSourceBillType = data.hSourceBillTypeField
                                    if (data.hSourceBillTypeField == "1103") {
                                        this.HMainSourceBillType = '收料通知单'
                                        this.hform.HMainSourceBillType = 1103
@@ -664,65 +796,162 @@
                                    }
                                    //供应商不可编辑
                                    this.showHSupName = false
                                    this.tabs = 2
                                } else { //物料条码
                                    this.tabs = 2
                                    console.log('data', data)
                                    if (!this.hform.HSourceBillNo) {
                                        this.hform.HSupName = data.hSupNameField
                                        this.hform.HSupID = data.hSupIDField
                                        this.hform.HSourceBillNo = data.hSourceBillNoField
                                        if (data.hDeptIDField != 0) {
                                            this.hform.HDeptID = data.hDeptIDField
                                            this.hform.HDeptName = data.hDeptNameField
                                        }
                                        //获取源单类型、源单单号
                                        this.hform.HMainSourceBillType = data.hSourceBillTypeField
                                        if (data.hSourceBillTypeField == "1103") {
                                            this.HMainSourceBillType = '收料通知单'
                                            this.hform.HMainSourceBillType = 1103
                                            this.showHMainSourceBillType = false
                                        } else if (data.hSourceBillTypeField == "1102") {
                                            this.HMainSourceBillType = '采购订单'
                                            this.hform.HMainSourceBillType = 1102
                                            this.showHMainSourceBillType = false
                                        } else {
                                            this.HMainSourceBillType = '手工录入'
                                            this.hform.HMainSourceBillType = -1
                                            this.showHMainSourceBillType = false
                                        }
                                        if (data.hMulSourceFlagField == 0) {
                                            this.showHSourceBillNo = false
                                        }
                                        //供应商不可编辑
                                        this.showHSupName = false
                                    }
                                }
                                //显示表体明细
                                this.DisBillEntryList()
                                //清空数量
                                this.hform.HQty = ''
                            } else {
                                CommonUtils.playSound(0);
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            }
                            this.refreshHBarCodeFocus()
                        },
                        fail: (res) => {
                            CommonUtils.playSound(0);
                            console.log(res);
                            //显示表体明细
                            this.DisBillEntryList()
                            //清空数量
                            this.hform.HQty = ''
                        } else {
                            CommonUtils.playSound(0);
                            uni.showToast({
                                title: '接口请求失败',
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                            this.refreshHBarCodeFocus()
                        },
                    });
                        this.refreshHBarCodeFocus()
                    } catch (e) {
                        this.playSound(0)
                        this.refreshHBillNoFocus()
                        uni.showToast({
                            title: '接口请求失败: ' + e,
                            icon: 'none'
                        })
                    }
                    // uni.request({
                    //     url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
                    //     data: {
                    //         sBarCode: sBarCode,
                    //         HBillID: this.hform.HInterID || 0,
                    //         HBillType: this.hform.HBillType,
                    //         HBillNo: this.hform.HBillNo,
                    //         HMaker: this.hform.HMaker,
                    //         HWhID: sHWHID,
                    //         HSPID: sHSPID,
                    //         HQty: sHQty,
                    //         // HRedBlueFlag: this.hform.HRedBlueFlag,
                    //         // SourceFlag: HSourceFlag,
                    //         // HSourceBillNo: sSourceBillNo,
                    //         // HSourceBillType: sSourceBillType,
                    //         HStockOrgID: this.hform.HStockOrgID,
                    //         // HScanStyle: "",
                    //         // HCustom1: "",
                    //         // HCustom2: ""
                    //     },
                    //     success: (res) => {
                    //         console.log('扫码返回', res.data);
                    //         this.hform.HBarCode = ''
                    //         if (res.data.count == 1) {
                    //             CommonUtils.playSound(1);
                    //             var data = res.data.data
                    //             if (data.hBarTypeField == '仓库条码') {
                    //                 this.hform.HWHName = data.hWhNameField
                    //                 this.hform.HWHID = data.hWhIDField
                    //                 this.hform.HStockPlaceName = ''
                    //                 this.hform.HStockPlaceID = 0
                    //                 if (data.hSPFlagField == 0) {
                    //                     this.showHStockPlaceName = false
                    //                 } else {
                    //                     this.showHStockPlaceName = true
                    //                 }
                    //             } else if (data.hBarTypeField == '仓位条码') {
                    //                 this.hform.HWHName = data.hWhNameField
                    //                 this.hform.HWHID = data.hWhIDField
                    //                 this.hform.HStockPlaceName = data.hSPNameField
                    //                 this.hform.HStockPlaceID = data.hSPIDField
                    //             } else if (data.hBarTypeField == '部门条码') {
                    //                 this.hform.HDeptName = data.hDeptNameField
                    //                 this.hform.HDeptID = data.hDeptIDField
                    //                 this.tabs = 1
                    //             } else if (data.hBarTypeField == '源单条码') {
                    //                 this.hform.HSupName = data.hSupNameField
                    //                 this.hform.HSupID = data.hSupIDField
                    //                 if (data.hDeptIDField != 0) {
                    //                     this.hform.HDeptID = data.hDeptIDField
                    //                     this.hform.HDeptName = data.hDeptNameField
                    //                 }
                    //                 this.hform.HSourceBillNo = data.hSourceBillNoField
                    //                 //获取源单类型、源单单号
                    //                 if (data.hSourceBillTypeField == "1103") {
                    //                     this.HMainSourceBillType = '收料通知单'
                    //                     this.hform.HMainSourceBillType = 1103
                    //                     this.showHMainSourceBillType = false
                    //                 } else if (data.hSourceBillTypeField == "1102") {
                    //                     this.HMainSourceBillType = '采购订单'
                    //                     this.hform.HMainSourceBillType = 1102
                    //                     this.showHMainSourceBillType = false
                    //                 } else {
                    //                     this.HMainSourceBillType = '手工录入'
                    //                     this.hform.HMainSourceBillType = -1
                    //                     this.showHMainSourceBillType = false
                    //                 }
                    //                 if (data.hMulSourceFlagField == 0) {
                    //                     this.showHSourceBillNo = false
                    //                 }
                    //                 //供应商不可编辑
                    //                 this.showHSupName = false
                    //                 this.tabs = 2
                    //             } else { //物料条码
                    //                 this.tabs = 2
                    //                 console.log('data', data)
                    //                 if (!this.hform.HSourceBillNo) {
                    //                     this.hform.HSupName = data.hSupNameField
                    //                     this.hform.HSupID = data.hSupIDField
                    //                     this.hform.HSourceBillNo = data.hSourceBillNoField
                    //                     if (data.hDeptIDField != 0) {
                    //                         this.hform.HDeptID = data.hDeptIDField
                    //                         this.hform.HDeptName = data.hDeptNameField
                    //                     }
                    //                     //获取源单类型、源单单号
                    //                     this.hform.HMainSourceBillType = data.hSourceBillTypeField
                    //                     if (data.hSourceBillTypeField == "1103") {
                    //                         this.HMainSourceBillType = '收料通知单'
                    //                         this.hform.HMainSourceBillType = 1103
                    //                         this.showHMainSourceBillType = false
                    //                     } else if (data.hSourceBillTypeField == "1102") {
                    //                         this.HMainSourceBillType = '采购订单'
                    //                         this.hform.HMainSourceBillType = 1102
                    //                         this.showHMainSourceBillType = false
                    //                     } else {
                    //                         this.HMainSourceBillType = '手工录入'
                    //                         this.hform.HMainSourceBillType = -1
                    //                         this.showHMainSourceBillType = false
                    //                     }
                    //                     if (data.hMulSourceFlagField == 0) {
                    //                         this.showHSourceBillNo = false
                    //                     }
                    //                     //供应商不可编辑
                    //                     this.showHSupName = false
                    //                 }
                    //             }
                    //             //显示表体明细
                    //             this.DisBillEntryList()
                    //             //清空数量
                    //             this.hform.HQty = ''
                    //         } else {
                    //             CommonUtils.playSound(0);
                    //             uni.showToast({
                    //                 title: res.data.Message,
                    //                 icon: 'none'
                    //             })
                    //         }
                    //
                    //         this.refreshHBarCodeFocus()
                    //     },
                    //     fail: (res) => {
                    //         CommonUtils.playSound(0);
                    //         console.log(res);
                    //         uni.showToast({
                    //             title: '接口请求失败',
                    //             icon: 'none'
                    //         })
                    //
                    //         this.refreshHBarCodeFocus()
                    //     },
                    // });
                }
            },
            //物料信息
@@ -821,7 +1050,7 @@
                    url: '/pages/shengchanlingliao/form?OperationType=1'
                })
            },
            submit() {
            async submit() {
                if (this.hform.HInterID == 0 || !this.hform.HInterID) {
                    uni.showToast({
                        title: '没有扫码信息,请先扫描单据条码!',
@@ -855,49 +1084,99 @@
                            title: '请稍候'
                        })
                        var sMainStr = JSON.stringify(this.hform);
                        uni.request({
                            url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_BillCheck_Json',
                            method: 'POST',
                            dataType: "json",
                            data: {
                                oMain: sMainStr
                            },
                            success: (res) => {
                                console.log(1, res);
                                uni.hideLoading()
                                if (res.data.count == 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url: '/pages/shengchanlingliao/form?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(() => {
                                                    uni.navigateBack();
                                                }, 50)
                                            }
                        try {
                            let res = await CommonUtils.doRequest2Sync({
                                url: '/WEBSController/set_SaveMateOutBill_BillCheck_Json',
                                method: 'POST',
                                data: {
                                    oMain: sMainStr
                                },
                            })
                            if(!res) {
                                return
                            }
                            console.log(1, res);
                            uni.hideLoading()
                            if (res.data.count == 1) {
                                uni.showModal({
                                    title: '提示',
                                    content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                    success: (res) => {
                                        if (res.confirm) {
                                            console.log('用户点击确定');
                                            uni.redirectTo({
                                                url: '/pages/shengchanlingliao/form?OperationType=1'
                                            })
                                        } else if (res.cancel) {
                                            console.log('用户点击取消');
                                            setTimeout(() => {
                                                uni.navigateBack();
                                            }, 50)
                                        }
                                    });
                                } else {
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                }
                            },
                            fail: (res) => {
                                console.log(res);
                                    }
                                });
                            } else {
                                uni.showToast({
                                    title: '接口请求失败',
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                            },
                        });
                            }
                        } catch (e) {
                            this.playSound(0)
                            this.refreshHBillNoFocus()
                            uni.showToast({
                                title: '接口请求失败: ' + e,
                                icon: 'none'
                            })
                        }
                        // uni.request({
                        //     url: this.serverUrl + '/WEBSController/set_SaveMateOutBill_BillCheck_Json',
                        //     method: 'POST',
                        //     dataType: "json",
                        //     data: {
                        //         oMain: sMainStr
                        //     },
                        //     success: (res) => {
                        //         console.log(1, res);
                        //         uni.hideLoading()
                        //         if (res.data.count == 1) {
                        //             uni.showModal({
                        //                 title: '提示',
                        //                 content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                        //                 success: (res) => {
                        //                     if (res.confirm) {
                        //                         console.log('用户点击确定');
                        //                         uni.redirectTo({
                        //                             url: '/pages/shengchanlingliao/form?OperationType=1'
                        //                         })
                        //                     } else if (res.cancel) {
                        //                         console.log('用户点击取消');
                        //                         setTimeout(() => {
                        //                             uni.navigateBack();
                        //                         }, 50)
                        //                     }
                        //                 }
                        //             });
                        //         } else {
                        //             uni.showToast({
                        //                 title: res.data.Message,
                        //                 icon: 'none'
                        //             })
                        //         }
                        //     },
                        //     fail: (res) => {
                        //         console.log(res);
                        //         uni.showToast({
                        //             title: '接口请求失败',
                        //             icon: 'none'
                        //         })
                        //     },
                        // });
                    }
                }
            },
pages/tiaomaguanli/table.vue
@@ -146,6 +146,13 @@
                            console.log('扫码返回', res.data.data);
                            this.HBarCode = ''
                            if (res.data.count == 1) {
                                if(res.data.data.length < 1) {
                                     this.playSound(0)
                                     return uni.showToast({
                                         title: '该单据号对应的单据不存在!',
                                         icon: 'none'
                                     })
                                }
                                this.playSound(1)
                                var data = res.data.data
                                this.baseInfo = {
pages/zutuosaoma/form.vue
@@ -80,6 +80,14 @@
                    </view>
                </view>
            </view>
            <view class="bill-info">
                <checkbox-group @change="checkboxGroupChangeHandler">
                <view class="form-item" style="justify-content: right;">
                    <view class="title">质量审批</view>
                    <checkbox value="qualityApproval"></checkbox>
                </view>
                </checkbox-group>
            </view>
        </view>
        <view class="bottom-btn" id="bottom-btn">
            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">提交</button>
@@ -173,6 +181,8 @@
                    HInterID: '',
                    HStockOrgName: uni.getStorageSync("Organization"),
                    HStockOrgID: uni.getStorageSync("OrganizationID"),
                    HQualityApproval: false,
                },
                // 分页模块元数据
                paginationMeta: {
@@ -181,6 +191,14 @@
            }
        },
        methods: {
            checkboxGroupChangeHandler(e) {
                let checkBoxValues = Array.from(e.detail.value)
                if(checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
                    this.hform.HQualityApproval = true
                }else {
                    this.hform.HQualityApproval = false
                }
            },
            onTableRowClickHandler(row, index) {
                console.log('row: ',row);
                if(!this.listData[index].checked){
@@ -210,13 +228,14 @@
            GetMeesageByBarCode_Pack(HBarCode_Pack) {
                // 获取托条码对应的数据
                CommonUtils.doRequest2({
                    url: '/WEBSController/Get_PackBarCode_PackUnionBill_New_Json',
                    url: '/WEBSController/Get_PackBarCode_PackUnionBill_Json',
                    data: {
                        HInterID: this.hform.HInterID,
                        HInterID: this.hform.HInterID || 0,
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.HBillType,
                        HBillSubType: this.HBillSubType,
                        HBarCode_Pack: HBarCode_Pack
                        HBarCode_Pack: HBarCode_Pack,
                        HMaker: getUserInfo()['Czymc'],
                        HStockOrgID: uni.getStorageSync('OrganizationID')
                    },
                    resFunction: (res) => {
                        let {
@@ -253,7 +272,7 @@
                })
            },
            GetMeesageByBarCode(HBarCode) {
                // 获取包条码对应的数据
                // 获取待组托条码对应的数据
                let HBarCode_Pack = this.HBarCode_Pack
                let sOldBarCode = this.HBarCode
                let HDeleteFlag = sOldBarCode.substring(0, 1)
@@ -261,7 +280,7 @@
                if (!HBarCode_Pack) {
                    return uni.showToast({
                        icon: 'none',
                        title: '托条码为空,请先扫描托条码',
                        title: '托条码不能为空,请先扫描托条码!',
                    })
                }
@@ -269,7 +288,7 @@
                    if (!sBarCode) {
                        return uni.showToast({
                            icon: 'none',
                            title: '请扫描要删除的箱条码',
                            title: '请扫描要删除的条码',
                        })
                    } else {
                        this.HBarCodeFocusRefresh()
@@ -304,19 +323,17 @@
                    if (!sBarCode) {
                        return uni.showToast({
                            icon: 'none',
                            title: '箱条码不能为空,请扫描箱条码',
                            title: '条码不能为空,请扫描条码!',
                        })
                    }
                    CommonUtils.doRequest2({
                        url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json',
                        url: '/WEBSController/Get_BarCode_PackUnionBill_Json',
                        data: {
                            "HInterID": this.hform.HInterID,
                            "HBarCode": sBarCode,
                            "HBillType": this.HBillType,
                            "HBillNo": this.hform.HBillNo,
                            "HBillSubType": this.HBillSubType,
                            "HBarCode_Pack": HBarCode_Pack,
                            "HMaterNumber_Pack": this.HMaterNumber_Pack,
                            "HMaker": this.hform.HMaker,
                            "HStockOrgID": this.hform.HStockOrgID
                        },
@@ -565,14 +582,14 @@
            // 1为 装箱 2为 组托
            this.BarCodeType = e.BarCodeType || 1
            this.OperationType = e.OperationType || 1
            this.HBarCode_Pack_Temp = e.CommonUtils || ""
            this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
            if (this.OperationType == 1) {
                this.getMaxNo()
            } else if (this.OperationType == 2) {
                this.GetMeesageByBarCode_Pack()
                this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
                this.DisBillEntryList()
                this.tabs = 1
                this.tabs = 0
            }
pages/zutuosaoma/table.vue
@@ -1,28 +1,517 @@
<template>
    <view>
    <view class="content">
        <view class="tabs">
            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缓存列表</view>
        </view>
        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
        <view class="form" v-if="tabs == 0">
            <view class="buttons" @tap="add">
                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>新增
            </view>
        </view>
        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
            <uni-card :title="item.制单日期.substr(0,10)" :extra="item.单据号" style="margin: 10px;"
                @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-if="item.托条码">
                        <text>托条码:</text>{{item.托条码}}
                    </view>
                    <view class="detail" v-if="item.制单人">
                        <text>制单人:</text>{{item.制单人}}
                    </view>
                    <view class="detail" v-if="item.制单日期">
                        <text>制单日期:</text>{{ item.制单日期.split('T')[0] }}
                    </view>
                    <view class="detail" v-if="item.组织">
                        <text>组织:</text>{{item.组织}}
                    </view>
                </view>
                <view class="more">
                    <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>编辑
                    </view>
                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>删除
                    </view>
                </view>
            </uni-card>
        </view>
        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
            <uni-card :title="item.日期" :extra="item.单据号" style="margin: 10px;"
                @tap="showDetail = showDetail==index?-1:index">
                <view class="card-detail">
                    <view class="detail" v-if="item.状态">
                        <text>状态:</text>{{item.状态}}
                    </view>
                    <view class="detail" v-if="item.制单人">
                        <text>制单人:</text>{{item.制单人}}
                    </view>
                    <view class="detail" v-if="item.数量">
                        <text>数量:</text>{{item.数量}}
                    </view>
                    <view class="detail" v-if="item.源单单号">
                        <text>源单单号:</text>{{item.源单单号}}
                    </view>
                    <view class="detail" v-if="item.物料代码">
                        <text>物料代码:</text>{{item.物料代码}}
                    </view>
                    <view class="detail" v-if="item.物料名称">
                        <text>物料名称:</text>{{item.物料名称}}
                    </view>
                    <view class="detail" v-if="item.规格型号">
                        <text>规格型号:</text>{{item.规格型号}}
                    </view>
                    <view class="detail" v-if="item.组织">
                        <text>组织:</text>{{item.组织}}
                    </view>
                </view>
                <view class="more">
                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>显示二维码
                    </view>
                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>撤销
                    </view>
                </view>
            </uni-card>
        </view>
        <view class="over" v-if="!listData || listData.length == 0">暂无数据</view>
        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">加载中...</view>
        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">已到底</view>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
    </view>
</template>
<script>
    import dayjs from "dayjs";
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from "@/utils/common.js"
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    export default {
        data() {
            return {
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
                MvarReportTitle: '生产领料单缓存列表',
                hform: {
                    HBillNo: '',
                    HSourceBillNo: '',
                    HBillType: 3783,
                    HMaker: uni.getStorageSync('HUserName'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                },
                sWhere: '',
                listData: [],
                showList: [],
                showDetail: -1,
                page: 1,
            }
        },
        components: {
            BarCodePopupVue
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)
            console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
        onReachBottom: function() {
            this.page++
            setTimeout(() => {
                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
            }, 100)
        },
        onPullDownRefresh: function() {
            this.clear()
            setTimeout(() => {
                uni.stopPullDownRefresh();
            }, 1000);
        },
        methods: {
            async qrCodeDisplay(item) {
                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
                await this.$nextTick()
                this.$refs.barcodePopup.open()
            },
            CheckModRight() {
                uni.request({
                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
                    data: {
                        ModRightName: 'CE_PackUnion',
                        HUserName: uni.getStorageSync('HUserName')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {} else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            getPage(page, list) {
                let sindex = (parseInt(page) - 1) * 20
                let eindex = parseInt(page) * 20
                let newList = list.slice(sindex, eindex)
                return newList
            },
            changeTab(e) {
                this.tabs = e
                this.page = 1
                this.showList = []
                if (this.tabs == 0) {
                    this.urls = '/WEBSController/GetSc_PackUnionBill_TempList_Json'
                }
                // if(this.tabs == 1){
                //     this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
                // }
                this.getList()
            },
            getList() {
                uni.showLoading({
                    title: '加载中...'
                })
                uni.request({
                    url: this.serverUrl + this.urls,
                    data: this.hform,
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            this.listData = res.data.data
                            this.showList = this.getPage(this.page, this.listData)
                            setTimeout(() => {
                                uni.hideLoading()
                            }, 1000)
                        } else {
                            uni.hideLoading()
                            this.listData = []
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.hideLoading()
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            search() {
                this.sWhere = ''
                this.listData = []
                this.page = 1
                this.showList = []
                console.log(this.hform)
                // if (this.hform.HBillNo) {
                //     this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
                // }
                // if (this.hform.HSourceBillNo) {
                //     this.sWhere += " and 设备类型 like '%" + this.hform.HSourceBillNo + "%'";
                // }
                this.getList()
            },
            clear() {
                this.listData = []
                this.page = 1
                this.showList = []
                this.sWhere = ''
                this.hform = {
                    HBillNo: '',
                    HSourceBillNo: '',
                    HBillType: 3783,
                    HMaker: uni.getStorageSync('HUserName'),
                    HStockOrgID: uni.getStorageSync('OrganizationID'),
                }
                this.getList()
            },
            add() {
                uni.navigateTo({
                    url: './form?OperationType=1'
                })
            },
            //编辑
            edit(item) {
                console.log(item)
                // uni.request({
                //     url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
                //     data:{ "HInterID": item.HInterID, "HBillNo": item.单据号, "HBillType": this.hform.HBillType },
                //     success: (res) => {
                //         console.log(1,res);
                //         if(res.data.count == 1){
                uni.navigateTo({
                    url: './form?OperationType=2&HBarCode_Pack_Temp=' + item["HBarCode_Pack"],
                })
                //                     }else{
                //                         uni.showToast({
                //                             title:res.data.Message,
                //                             icon:'none'
                //                         })
                //                     }
                //                 },
                //                 fail: (res) => {
                //                     console.log(res);
                //                     uni.hideLoading()
                //                     uni.showToast({
                //                         title:'接口请求失败',
                //                         icon:'none'
                //                     })
                //                 },
                //             })
            },
            //删除
            del(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '确认要删除记录?删除后不能恢复',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/DeleteTemp_PackUnionBill_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    // HBillNo: item.单据号,
                                    // HBillType: this.hform.HBillType,
                                    // HMaker: uni.getStorageSync('HUserName'),
                                    // MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
            //撤销
            revoke(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '是否确认撤销',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    HBillNo: item.单据号,
                                    HBillType: this.hform.HBillType,
                                    HMaker: uni.getStorageSync('HUserName'),
                                    MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
        }
    }
</script>
<style>
<style lang="scss" scoped>
    .form {
        width: 640rpx;
        margin: 20rpx auto;
        margin-top: 90rpx;
    }
</style>
    .tabs {
        width: 100%;
        position: fixed;
        left: 0;
        z-index: 9;
        display: flex;
        background-color: #e5e5e5;
        view {
            width: 50%;
            font-size: 30rpx;
            color: #333;
            text-align: center;
            padding: 16rpx 0;
        }
        .on {
            color: #3a78ff;
            font-weight: bold;
            border-bottom: 3px solid #3a78ff;
        }
    }
    .buttons {
        width: 100%;
        display: flex;
        justify-content: center;
        margin-top: 20rpx;
        button {
            border-radius: 50rpx;
            width: 180rpx;
            height: 66rpx;
            line-height: 66rpx;
            font-size: 28rpx;
        }
        .btn-a {
            background-color: #acacac;
            color: #fff;
        }
        .btn-b {
            background-color: #41a863;
            color: #fff;
        }
        .btn-c {
            background-color: #3a78ff;
            color: #fff;
        }
    }
    .form-item {
        display: flex;
        align-items: center;
        font-size: 28rpx;
        padding: 6rpx 0;
        .title {
            width: 180rpx;
            text {
                color: red;
                font-weight: bold;
            }
        }
        .right {
            width: 450rpx;
            border-radius: 22rpx;
            border: 1px solid #acacac;
        }
        .righton {
            width: 450rpx;
            border-radius: 22rpx;
            border: 1px solid #e4e4e4;
            background-color: #e4e4e4;
        }
        input {
            width: 100%;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }
    }
    .list {
        width: 100%;
        .card-detail {
            width: 100%;
            display: flex;
            flex-wrap: wrap;
            justify-content: space-between;
            line-height: 120%;
            .detail {
                // width: 50%;
                font-size: 26rpx;
                margin-bottom: 12rpx;
                color: #555;
                margin-right: 20rpx;
                text {
                    color: #999;
                    font-size: 26rpx;
                }
            }
        }
        .more {
            color: #888;
            font-size: 26rpx;
            display: flex;
            border-top: 1px solid #eee;
            padding-top: 20rpx;
            .part {
                width: 50%;
                display: flex;
                align-items: center;
                justify-content: center;
            }
        }
    }
</style>
utils/common.js
@@ -1,19 +1,22 @@
class commonUtils {
    serverUrl
    audioContext // 全局音频实例
    requestLock // 请求控制锁(同步)
    constructor() {
        this.serverUrl = uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API/';
        this.audioContext = null;
        this.requestLock = false
    }
    setServerUrl(url) {
        this.serverUrl = url
    }
    getServerUrl() {
        return this.serverUrl
    }
    // 防抖函数
    debounce(func, delay, immediate = false) {
@@ -245,60 +248,103 @@
            }
        })
    }
    doRequest2({url, data, resFunction, errFunction,method, that}){
        that = that || this;
        let errorTip = null;
        uni.showLoading({
            title: '加载中...'
        })
        uni.request({
            method: method || "GET",
            url: this.serverUrl + url,
            data: data || "",
            success: (res) => {
                if (typeof resFunction === 'function') {
                    resFunction.call(that, res)
                } else if (typeof errFunction === 'undefined' || errFunction === null) {
                    return
                } else {
                    throw new TypeError("访问成功回调函数类型不为函数或者空!")
                }
            },
            fail: (err) => {
                console.error(err)
                errorTip = () => {
                    uni.showToast({
                        icon: "none",
                        title: err.errMsg || err.data.message || "接口异常!",
                        duration: 2000
                    })
                }
                if (typeof errFunction === 'function') {
                    errFunction.call(that, err)
                } else if (typeof errFunction === 'undefined' || errFunction === null) {
                    return
                } else {
                    throw new TypeError("访问失败回调函数类型不为函数或者空!")
                }
            },
            complete: () => {
                setTimeout(() => {
                    uni.hideLoading()
                    if (errorTip != null) {
                        errorTip()
                    }
                }, 1000)
            }
        })
    }
    stringToBoolean(str) {
      // 忽略大小写的转换
      return str?.toLowerCase() === "true";
    }
    doRequest2({
        url,
        data,
        resFunction,
        errFunction,
        method,
        that
    }) {
        that = that || this;
        let errorTip = null;
        uni.showLoading({
            title: '加载中...'
        })
        uni.request({
            method: method || "GET",
            url: this.serverUrl + url,
            data: data || "",
            success: (res) => {
                if (typeof resFunction === 'function') {
                    resFunction.call(that, res)
                } else if (typeof errFunction === 'undefined' || errFunction === null) {
                    return
                } else {
                    throw new TypeError("访问成功回调函数类型不为函数或者空!")
                }
            },
            fail: (err) => {
                console.error(err)
                errorTip = () => {
                    uni.showToast({
                        icon: "none",
                        title: err.errMsg || err.data.message || "接口异常!",
                        duration: 2000
                    })
                }
                if (typeof errFunction === 'function') {
                    errFunction.call(that, err)
                } else if (typeof errFunction === 'undefined' || errFunction === null) {
                    return
                } else {
                    throw new TypeError("访问失败回调函数类型不为函数或者空!")
                }
            },
            complete: () => {
                setTimeout(() => {
                    uni.hideLoading()
                    if (errorTip != null) {
                        errorTip()
                    }
                }, 1000)
            }
        })
    }
    // 同步执行请求 (配合await或者then)
    async doRequest2Sync({
        url,
        data,
        method,
    }) {
        if(this.requestLock){
            console.warn("该请求被锁定,已退出请求!")
            return
        }
        this.requestLock = true
        return new Promise((resolve, reject) => {
            // that = that || this;
            let errorTip = null;
            uni.showLoading({
                title: '加载中...'
            })
            uni.request({
                method: method || "GET",
                url: this.serverUrl + url,
                data: data || "",
                success: (res) => {
                    resolve(res)
                },
                fail: (err) => {
                    reject(err)
                },
                complete: () => {
                    // 释放请求锁
                    this.requestLock = false
                    uni.hideLoading()
                }
            })
        })
    }
    stringToBoolean(str) {
        // 忽略大小写的转换
        return str?.toLowerCase() === "true";
    }
    // uni-app 播放音频封装
    playSound(e) {
@@ -309,25 +355,57 @@
            innerAudioContext.src = '/static/jingbao.wav';
        }
        innerAudioContext.play(); // 播放音频
        innerAudioContext.onPlay(() => {
            console.log('开始播放');
        });
        innerAudioContext.onError((res) => {
            console.log(res.errMsg);
            console.log(res.errCode);
        });
        innerAudioContext.onPause(function(){
            console.log('播放出现错误,销毁');
            innerAudioContext.destroy();
        })
        innerAudioContext.onPlay(() => {
            console.log('开始播放');
        });
        innerAudioContext.onError((res) => {
            console.log(res.errMsg);
            console.log(res.errCode);
        });
        innerAudioContext.onPause(function() {
            console.log('播放出现错误,销毁');
            innerAudioContext.destroy();
        })
    }
    // playSound(e) {
    //     // 全局维护一个音频实例,防止缓存溢出
    //     if (this.audioContext) {
    //         this.audioContext.destroy();
    //     }
    //     this.audioContext = uni.createInnerAudioContext();
    //     if (e == 1) {
    //         this.audioContext.src = '/static/success.wav';
    //     } else {
    //         this.audioContext.src = '/static/jingbao.wav';
    //     }
    //     this.audioContext.play(); // 播放音频
    //
    //     // 播放结束后销毁实例
    //     this.audioContext.onEnded(() => {
    //         this.audioContext.destroy();
    //         this.audioContext = null;
    //     });
    //
    //     // 错误处理
    //     this.audioContext.onError((err) => {
    //         uni.showToast({
    //             icon: 'none',
    //             title: `音频播放错误: ${err}`
    //         })
    //
    //         this.audioContext.destroy();
    //         this.audioContext = null;
    //     });
    // }
    replaceWithFunction(str, handler) {
      return str.replace(/\{(.+?)\}/g, (match, key) => {
        // 调用处理函数,传入匹配到的键
        return handler(key, match);
      });
        return str.replace(/\{(.+?)\}/g, (match, key) => {
            // 调用处理函数,传入匹配到的键
            return handler(key, match);
        });
    }
}