Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2025-07-25 e4d7742ff01953048b31d62456ca2a892a576350

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.18",
    "versionCode" : 118,
    "versionName" : "1.0.19",
    "versionCode" : 119,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/gongxuOut/form.vue

@@ -564,14 +564,22 @@
        methods: {
            //扫码
            toScanCode(){
                // this.hform.HBarCode = 'GXLX00001165'
                // this.getHBarCodeData('GXLX00001165')
                // const str = "GXLX250603001-01@10";
                uni.scanCode({
                    onlyFromCamera: true,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        this.hform.HBarCode = res.result
                        this.getHBarCodeData(res.result)
                        var str = res.result
                        if(str.includes('@')) {
                          const parts = str.split('@');
                          this.hform.HBarCode = parts[0]
                          this.hform.HProcNo = parts[1]
                          this.getHBarCodeData(parts[0])
                          this.getHProcNoData(parts[0],parts[1])
                        }else{
                            this.hform.HBarCode = res.result
                            this.getHBarCodeData(res.result)
                        }
                    }
                });
            },

 pages/weiwaigxIn/form.vue

@@ -408,8 +408,17 @@
                    onlyFromCamera: true,
                    success: (res) => {
                        console.log('条码内容：' + res.result);
                        this.hform.HBarCode = res.result
                        this.getHBarCodeData(res.result)
                        var str = res.result
                        if(str.includes('@')) {
                          const parts = str.split('@');
                          this.hform.HBarCode = parts[0]
                          this.hform.HProcNo = parts[1]
                          this.getHBarCodeData(parts[0])
                          this.getHProcNoData(parts[0],parts[1])
                        }else{
                            this.hform.HBarCode = res.result
                            this.getHBarCodeData(res.result)
                        }
                    }
                });
            },