Merge branch 'dev'

 /*
- * @Description: 
+ * @Description: 不动产权证
  * @Autor: renchao
  * @LastEditTime: 2023-05-16 14:04:18
  */
@@ -130,4 +130,4 @@ export function bdcqzPreview (data) {
         data,
         responseType: 'blob'
     })
-}
\ No newline at end of file
+}

 /*
- * @Description: 
+ * @Description: 材料信息
  * @Autor: renchao
  * @LastEditTime: 2023-05-16 14:04:42
  */

 /*
- * @Description: 
+ * @Description: 家庭房产信息
  * @Autor: renchao
  * @LastEditTime: 2023-05-16 14:05:25
  */

 /*
- * @Description:
+ * @Description: 楼盘表查询
  * @Autor: renchao
  * @LastEditTime: 2023-07-12 13:26:37
  */
@@ -71,16 +71,3 @@ export function getLpbTj(zrzbsm) {
     method: "get",
   });
 }
-
-/**
- * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
- * @param {*} data
- * @author: renchao
- */
- export function getZrzbsm(bsm) {
-  return request({
-    url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
-    method: "post",
-    data: bsm,
-  });
-}
\ No newline at end of file

@@ -58,5 +58,18 @@ export function getZjgcdyList (data) {
   })
 }
 
+/**
+ * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
+ * @param {*} data
+ * @author: renchao
+ */
+export function getZrzbsmList(bsm) {
+  return request({
+    url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
+    method: "post",
+    data: bsm,
+  });
+}
+
 
 

@@ -89,7 +89,7 @@ import lineItem from "./lineItem.vue";
 import ImportGeo from './tx/importGeo'
 	port geoUtils from "@/components/lineTree/tx/js/geoUtils";
 		rt featureUpdate from "@/libs/map/featureUpdate";
-			ort { deleteLjz, deleteZdy } from "@api/lpb"
+			ort { deleteLjz, deleteZdy } from "@api/lpcx.js"
 			 exportTemJson from '@/api/json/exportTemplate.json'
 		mport sxdr from '@/components/sxdr/sxdr'
 	port default {
@@ -99,7 +99,7 @@ import ImportGeo from './tx/importGeo'
 			e: Array,
 				ault: () => {
 					turn[];
-			
+
 						: {
 						e: Number,
 							ault: 16,
@@ -209,7 +209,7 @@ import ImportGeo from './tx/importGeo'
 																																f(res.success) {
 																																	this.loading()
 																																}
-				
+
 			,
 																																变菜单数据
 																																Visible(data) {

@@ -194,7 +194,7 @@
 <script>
 import lpbContent from "./lpbContent/index";
 import selectZrzH from "../ywbl/ywsq/components/selectZrzH";
-import { getLpbFwytAndQlxz, getLpbQsxtj, getLpbTj } from "@/api/lpb";
+import { getLpbFwytAndQlxz, getLpbQsxtj, getLpbTj } from "@/api/lpcx.js";
 export default {
   name: "lpb",
   props: {

@@ -30,7 +30,7 @@
   </div>
 </template>
 <script>
-import { getLpb } from "@/api/lpb";
+import { getLpb } from "@/api/lpcx.js";
 import chCpn from "./ch.vue";
 import zdyCpn from "./zdys.vue";
 import ljzsCpn from "./ljzs.vue";

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/sqcx";
+import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/jtfc.js";
 import { getPrintTemplateByCode } from "@/api/print";
 import { datas, sendThis } from "./dydjbdata";
 import { getLodop } from "@/utils/LodopFuncs"

@@ -33,10 +33,10 @@
       </div>
     </div>
 </template>
-  
+
 <script>
 import { datas, sendThis } from "./infodata";
-import { getFwmxInfo } from "@/api/sqcx";
+import { getFwmxInfo } from "@/api/jtfc.js";
 export default {
   props: {
     formData: {
@@ -103,4 +103,3 @@ export default {
   height: 30px;
 }
 </style>
-  
\ No newline at end of file

@@ -48,7 +48,7 @@ import { mapGetters } from "vuex";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./dydjbdata";
 import addDydjb from "./components/addDydjb.vue";
-import { getSqcxPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/jtfc.js";
 export default {
   name: "dydjb",
   components: { addDydjb },

@@ -120,7 +120,7 @@
   import printView from "./printView.vue";
   import { getIdCardInfo } from '@/utils/operation.js'
   import { getPrintTemplateByCode } from "@/api/print";
-  import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
+  import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/jtfc.js";
   export default {
     components: {
       printView

 <!--
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @LastEditTime: 2023-06-28 14:45:20
 -->
@@ -48,7 +48,7 @@
 <script>
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./jtfcdata";
-  import { getSqcxPage } from "@/api/sqcx";
+  import { getSqcxPage } from "@/api/jtfc.js";
   export default {
     name: "jtfc",
     mixins: [table],

@@ -110,7 +110,7 @@
 </template>
 
 <script>
-import { getJtfcInfo } from "@/api/sqcx";
+import { getJtfcInfo } from "@/api/jtfc.js";
 import { datas, sendThis } from "./sqcxjlInfodata";
 
 export default {

@@ -69,7 +69,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./sqcxjldata";
-import { getSqcxPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/jtfc.js";
 export default {
   name: "sqcxjl",
   mixins: [table],

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-07 13:12:58
+ * @LastEditTime: 2023-07-14 16:05:30
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -97,7 +97,7 @@
       handleClick (e) {
         this.bdcqz = this.headTabBdcqz[e.index - 0]
         this.activeName = this.headTabBdcqz.bsmBdcqz
-        if (this.activeName == '1') {
+        if (this.bdcqz.bdcqzlx == 1) {
           this.drawTextOnImage()
         } else {
           this.drawTextzmImage()

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-01 09:48:15
+ * @LastEditTime: 2023-07-14 16:01:33
 -->
 <template>
   <canvas id="mxcad">

@@ -17,7 +17,7 @@ import {
   unClaimTask
 } from "@/api/workFlow.js";
 import { mapGetters } from 'vuex'
-import { getZrzbsm } from "@/api/lpb";
+import { getZrzbsmList } from "@/api/search.js";
 import { ywPopupDialog } from "@/utils/popup.js";
 export default {
   data () {
@@ -140,7 +140,7 @@ export default {
           )
           break;
         case "B8":
-          getZrzbsm(this.bsmSlsq).then((res) => {
+          getZrzbsmList(this.bsmSlsq).then((res) => {
             if (res.code === 200) {
               this.$popupDialog('楼盘表', 'lpb/index', {
                 bsm: res.result[0]

@@ -97,10 +97,6 @@
     data () {
       return {
         queryForm: {
-          ywly: "",
-          qllx: "",
-          djlx: "",
-          ywh: "",
         },
         tableData: {
           total: 0,

@@ -50,7 +50,7 @@
 <script>
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./lpcxdata";
-  import { getLpZrz } from "@/api/lpb.js";
+  import { getLpZrz } from "@/api/lpcx.js";
   export default {
     name: "lpcx",
     components: {},