Merge branch 'mergeBranch' into allTestUrgent

src/HDrpManagement/dispatch/modules/printMaterials.vue

@@ -206,8 +206,8 @@ export default {
         })
       }else {
         if (this.nowSelect == '合格证'){
-          // window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
-          window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
+          window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
+          // window.open('http://61.164.207.46:8000' + res.data + `&${this.idName}=${this.dataid}`  + `&startid=${data.startid}`  + `&endid=${data.endid}`)
         }else {
           window.open(this.tool.getBaseUrl() + res.data + `&${this.idName}=${this.dataid}`)
         }