Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -11,6 +11,17 @@ export function getSearchList(data) {
 }
 }
 
 
 /**
 /**
+ * 综合查询
+ */
+export function getHfghbSearchList(data) {
+    return request({
+        url: '/system/basiccommon/queryWithHfghb',
+        method: 'post',
+        data : data,
+    })
+}
+
+/**
  * 宗地分割选择宗地列表
  * 宗地分割选择宗地列表
  * @param data
  * @param data
  */
  */

@@ -212,7 +212,7 @@
 <script>
 <script>
 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 {getHfghbSearchList} from "@api/search";
 import {getQjHDetailByBsm} from "@api/h";
 import {getQjHDetailByBsm} from "@api/h";
 export default {
 export default {
   name:"",
   name:"",
@@ -321,7 +321,7 @@ export default {
   methods:{
   methods:{
     //查询
     //查询
     search(){
     search(){
-      getSearchList(this.queryData).then(res => {
+      getHfghbSearchList(this.queryData).then(res => {
           this.tableData = res.result.records
           this.tableData = res.result.records
           this.total = res.result.total
           this.total = res.result.total
       })
       })

@@ -22,7 +22,7 @@
                     <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
                     <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
                     <td  colspan="4" class="psr">
                     <td  colspan="4" class="psr">
                         <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
                         <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
-                        <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
+                        <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="disableFlag">生成</el-button>
                     </td>
                     </td>
 <!--                    <td  colspan="2" align="center"  >原不动产单元</td>-->
 <!--                    <td  colspan="2" align="center"  >原不动产单元</td>-->
 <!--                    <td  colspan="4"  >-->
 <!--                    <td  colspan="4"  >-->
@@ -900,6 +900,8 @@
                 submit(data).then((res)=>{
                 submit(data).then((res)=>{
                     if(res.code===200){
                     if(res.code===200){
                         this.$message.success("提交完成！");
                         this.$message.success("提交完成！");
+                    }else {
+                        this.$message.warning(res.message)
                     }
                     }
                 })
                 })
             },
             },