Merge remote-tracking branch 'origin/master' into master

@@ -213,6 +213,7 @@
 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
 import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
 import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
 import {getSearchList} from "@api/search";
 import {getSearchList} from "@api/search";
+import {getQjHDetailByBsm} from "@api/h";
 export default {
 export default {
   name:"",
   name:"",
   components:{lpbContent},
   components:{lpbContent},
@@ -227,7 +228,7 @@ export default {
       queryData:{
       queryData:{
         bdcdyh: "",
         bdcdyh: "",
         bdcqzh: "",
         bdcqzh: "",
-        dylxs: ['zrz'],
+        dylxs: ['zrz','h'],
         qlrmc: "",
         qlrmc: "",
         qszt: [],
         qszt: [],
         xmmc: "",
         xmmc: "",
@@ -349,8 +350,16 @@ export default {
     },
     },
     //办理
     //办理
     handleClick(row){
     handleClick(row){
-      this.isSearch = false;
-      this.zrzbsm = row.glbsm;
+        if(row.dylx === 'zrz'){
+            this.isSearch = false;
+            this.zrzbsm = row.glbsm;
+        }else {
+            getQjHDetailByBsm(row.glbsm).then((res)=>{
+                this.isSearch = false;
+                this.zrzbsm = res.result.zrzbsm;
+            })
+        }
+
     },
     },
     //分页
     //分页
     handleCurrentChange(val) {
     handleCurrentChange(val) {