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

chenhaozhe

2025-07-31 8d211f430259d0ce8001819b08c7d7c8a05fc5c4

 pages/caigourukujiaoyan/form.vue

@@ -253,36 +253,40 @@
      methods: {
         //扫码
         toScanCode() {
            uni.scanCode({
               onlyFromCamera: true,
               success: (res) => {
                  console.log('条码内容：' + res.result);
                  // if(this.hform.HBarCode == '*'){
                  //    this.hform.HBarCode = this.hform.HBarCode + res.result
                  // }else{
                  //    this.hform.HBarCode = res.result
                  // }
                  this.hform.HBarCode = res.result
                  // this.GetMeesageByBillNo(this.hform.HBarCode)
                  this.getCode(this.hform.HBarCode)
               }
            });
            var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
            mpaasScanModule.mpaasScan({
               'hideAlbum': true,
               'timeoutInterval':'10', //超时时间
               'timeoutText':'未识别到二维码' //超时提醒            
            },(ret) => {
               console.log(ret.resp_result)
               // if(this.hform.HBarCode == '*'){
               //    this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
               // }else{
               //    this.hform.HBarCode = ret.resp_result
               // }
               this.hform.HBarCode = ret.resp_result
               // this.GetMeesageByBillNo(this.hform.HBarCode)
               this.getCode(this.hform.HBarCode)
            })
			
         },
         toScanBillCode() {
            uni.scanCode({
               onlyFromCamera: true,
               success: (res) => {
                  console.log('条码内容：' + res.result);
                  // if(this.hform.HBarCode == '*'){
                  //    this.hform.HBarCode = this.hform.HBarCode + res.result
                  // }else{
                  //    this.hform.HBarCode = res.result
                  // }
						
                  this.hform.HBillNo = res.result
                  this.GetMeesageByBillNo(this.hform.HBillNo)
               }
            });
            var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
            mpaasScanModule.mpaasScan({
               'hideAlbum': true,
               'timeoutInterval':'10', //超时时间
               'timeoutText':'未识别到二维码' //超时提醒            
            },(ret) => {
               console.log(ret.resp_result)
               // if(this.hform.HBarCode == '*'){
               //    this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
               // }else{
               //    this.hform.HBarCode = ret.resp_result
               // }
               this.hform.HBillNo = ret.resp_result
               this.GetMeesageByBillNo(this.hform.HBillNo)
            })
         },
         //扫描单据号条码
         GetMeesageByBillNo(e) {