Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaClient

cnf

2025-08-26 e1d24d932247e443a8893d8ebe85315fea5a5018

 H5/Js/Scbg.js

@@ -12,21 +12,26 @@
            stafId: "",
            stafName: "",
            stafList: [],

            BarcodesDetail: [],
            taskNo: "", //工单号
            itemNo: "", //物料编号
            planQty: "", //计划数量
            reportedQty: "", //已报工数量
            currentQty: "", //本次报工数量
            barcodeQty: "", //条码数量
            sjBillNo:"",//送检单号
            itemName: "", //物料名称
            itemModel: "", //物料型号

            load: false,

            active: 0,
            show: false,
            actions: [],
            actions: [],//列表的值
            show: false,//列表展示

            billactive: 0,
            billactions: [],//列表的值
            billshow: false,//列表展示
        }
    },
    mounted() {
@@ -35,6 +40,57 @@
            loginGuid: this.GetLoginInfor().loginGuid,
            loginAccount: this.GetLoginInfor().loginAccount,
        };

        that.AxiosHttp("post", 'MesStaff/GetList', {
            //name: that.userInfo.loginAccount,
        }, false)
            .then(function (res) {
                var json = res;
                if (json.status == 0) {
                    that.actions = json.data.tbBillList.map(item => {
                        return { name: item.staffName }
                    });

                    that.stafId = that.userInfo.loginAccount;
                    //that.stafId = '0305';
                    console.log('DAccccccccDAD' + that.stafId);

                    that.stafList = json.data.tbBillList;
                    //console.log('DAWDADWDADADADWD' + that.stafList);
                    //console.log('DAWDADWDA' + that.stafList);
                    //console.log('DADADAD' + that.stafId);

                    let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));

                    if (staf.length > 0) {
                        that.stafName = staf[0].staffName;
                        that.stafId = staf[0].staffNo;
                        that.$refs.barcode.focus();
                    } else {
                        that.$toast("未找到匹配的 用户名称");
                        that.$playSound('error');
                    }
                }
                else {
                    that.$toast.fail(json.message);
                    that.$playSound('error');
                }
                that.isLoading = false;
            })
            .catch(function (error) {
                that.isLoading = false;
                that.$playSound('error');
                that.$toast.fail("网络错误，请重试！");
                console.log(error);
            });
        // 默认情况下点击选项时不会自动收起
        // 可以通过 close-on-click-action 属性开启自动收起

       
        //this.GetMesItemBlDetailByBillNo();
        //this.$toast(item.name);
     

    },
    methods: {
        getInfo() {
@@ -51,11 +107,46 @@
                        that.actions = json.data.tbBillList.map(item => {
                            return { name: item.staffName }
                        });
                        that.$playSound('success');

                        that.stafList = json.data.tbBillList;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
        },
        selectBillNo() {
            this.billshow = true;

            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesWorkProd/GetRksqSelect',
            {
                staffNo: that.stafId
                //name: that.userInfo.loginAccount,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.billactions = json.data.result.rksqOrderList.map(item => {
                            return { name: item.billNo }
                        });

                        that.stafList = json.data.result.rksqOrderList;
                        that.$playSound('success');
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
@@ -88,6 +179,24 @@
            //this.$toast(item.name);

        },
        onBillSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
            this.billshow = false;

            let staf = this.stafList.filter(it => it.billNo === item.name);

            if (staf.length > 0) {
                this.sjBillNo = staf[0].billNo;
                this.$refs.sjBillNo.focus();
            } else {
                this.$toast("未找到匹配的送检单号");
                that.$playSound('error');
            }
            //this.GetMesItemBlDetailByBillNo();
            //this.$toast(item.name);

        },
        getStaff() {

            var that = this;
@@ -103,21 +212,28 @@
                        });

                        that.stafList = json.data.tbBillList;
                        that.$playSound('success');
                        console.log('DAWDADWDADADADWD' + that.stafList);
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起

            let staf = that.stafList.filter(it => it.staffNo === that.stafId);
            console.log('DAWDADWDA'+that.stafList);
            console.log('DADADAD'+ this.stafId);

            let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));

            if (staf.length > 0) {
                that.stafName = staf[0].staffName;
@@ -133,22 +249,25 @@
        getBarcode() {

            //this.barcode = value;

            //this.show = true;
            var that = this;
            

            if (!that.userInfo.loginAccount) {
                this.$toast.fail("请重新检查登录状态");
                that.$playSound('error');
                return;
            }

            if (!that.barcode) {
                this.$toast.fail("条码不能为空");
                that.$playSound('error');
                return;
            }

            if (!that.stafId) {
                that.$toast.fail("员工不允许为空");
                that.$playSound('error');
                return;
            }

@@ -171,12 +290,19 @@
                        that.barcodeQty = entity.barcodeQty; //条码数量
                        that.itemName = entity.itemName; //物料名称
                        that.itemModel = entity.itemModel; //物料型号
                        that.sjBillNo = entity.sjBillNo;
                        that.BarcodesDetail = entity.barcodesDetail;
                        console.log('DADWADWD WDD AD AD A');
                        console.log(entity.barcodesDetail);
                        console.log(that.BarcodesDetail);
                        that.$notify({ type: 'success', message: '扫描成功' });
                        that.$playSound('success');
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
@@ -185,6 +311,7 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
        },
@@ -197,40 +324,53 @@

            if (!that.userInfo.loginAccount) {
                this.$toast.fail("请重新检查登录状态");
                that.$playSound('error');
                that.load = false;
                return;
            }

            if (!that.barcode) {
                this.$toast.fail("条码不能为空");
                that.load = false;
                return;
            }
            //if (!that.barcode) {
            //    this.$toast.fail("条码不能为空");
            //    that.load = false;
            //    return;
            //}

            if (!that.currentQty) {
                this.$toast.fail("报工数量不能为空");
                that.load = false;
                return;
            }
            //if (!that.currentQty) {
            //    this.$toast.fail("报工数量不能为空");
            //    that.load = false;
            //    return;
            //}

            if (that.currentQty <=0) {
                this.$toast.fail("报工数量需要大于零");
            //if (that.currentQty <=0) {
            //    this.$toast.fail("报工数量需要大于零");
            //    that.load = false;
            //    return;
            //}

            if (!that.sjBillNo) {
                this.$toast.fail("送检单号不能为空");
                that.$playSound('error');
                that.load = false;
                return;
            }

            that.AxiosHttp("post", 'MesWorkProd/ScanWorkProd', {
                userNo: that.userInfo.loginAccount,
                itemBarcode: that.barcode,
                quantity: that.currentQty
                userNo: that.stafId,
                //itemBarcode: that.barcode,
                //quantity: that.currentQty
                sjBillNo: that.sjBillNo
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.$notify({ type: 'success', message: '保存成功' });
                        that.$notify({ type: 'success', message: '送检成功' });

                        that.BarcodesDetail = [];
                        that.$playSound('success');
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                    that.load = false;
@@ -238,8 +378,64 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
        },

        getBillNo() {
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesWorkProd/GetRksqList', {
                staffNo: that.stafId,
                sjBillNo: that.sjBillNo
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {

                        let entity = json.data.result;
                        that.BarcodesDetail = entity.barcodesDetail;
                        console.log('DADWADWD WDD AD AD A');
                        console.log(entity.barcodesDetail);
                        console.log(that.BarcodesDetail);
                        that.$notify({ type: 'success', message: '扫描成功' });
                        that.$refs.sjBillNo.focus();
                        that.$playSound('success');
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.sjBillNo.focus();
                        that.$playSound('error');
                        that.barcode = null;
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起

            //console.log('DAWDADWDA' + that.stafList);
            //console.log('DADADAD' + this.stafId);

            //let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));

            //if (staf.length > 0) {
            //    that.stafName = staf[0].staffName;
            //    that.stafId = staf[0].staffNo;
            //    that.$refs.barcode.focus();
            //} else {
            //    that.$toast("未找到匹配的 用户名称");
            //}
            //this.GetMesItemBlDetailByBillNo();
            //this.$toast(item.name);

        }

    }
})