Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

 import request from '@/utils/request'
 import request from '@/utils/request'
 import SERVER from './config'
 import SERVER from './config'
-// 获取家庭房产列表
-export function getJtfcPage (data) {
+// 获取申请查询列表
+export function getSqcxPage (data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcPage',
-    method: 'post',
-    data
-  })
-}
-
-// 获取房屋明细列表
-export function getFwmxPage (data) {
-  return request({
-    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxPage',
+    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getSqcxPage',
     method: 'post',
     method: 'post',
     data
     data
   })
   })
@@ -45,6 +36,15 @@ export function getJtfcInfo (params) {
   })
   })
 }
 }
 
 
+// 获取房屋明细记录详细信息
+export function getFwmxInfo (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getFwmxInfo/',
+    method: 'get',
+    params
+  })
+}
+
 // 打印家庭房产
 // 打印家庭房产
 export function printJtcfInfo (data) {
 export function printJtcfInfo (data) {
   return request({
   return request({

@@ -53,7 +53,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { addFwmxCxjgXx, getJtfcInfo,printJtcfInfo } from "@/api/sqcx";
+import { addFwmxCxjgXx, getFwmxInfo,printJtcfInfo } from "@/api/sqcx";
 import { getPrintTemplateByCode } from "@/api/system";
 import { getPrintTemplateByCode } from "@/api/system";
 import { datas, sendThis } from "./dydjbdata";
 import { datas, sendThis } from "./dydjbdata";
 import { getLodop } from "@/utils/LodopFuncs"
 import { getLodop } from "@/utils/LodopFuncs"
@@ -144,7 +144,7 @@ export default {
     //加载详细信息
     //加载详细信息
     loadData () {
     loadData () {
       this.$startLoading();
       this.$startLoading();
-      getJtfcInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
+      getFwmxInfo({ sqcxBsm: this.sqcxBsm }).then((res) => {
         this.$endLoading();
         this.$endLoading();
         if (res.code == 200) {
         if (res.code == 200) {
            this.activeStep = 2;
            this.activeStep = 2;

@@ -36,10 +36,13 @@
   
   
 <script>
 <script>
 import { datas, sendThis } from "./infodata";
 import { datas, sendThis } from "./infodata";
-import { getJtfcInfo } from "@/api/sqcx";
+import { getFwmxInfo } from "@/api/sqcx";
 export default {
 export default {
   props: {
   props: {
-    
+    formData: {
+      type: Object,
+      default: () => {},
+    },
   },
   },
   data () {
   data () {
     return {
     return {
@@ -65,10 +68,24 @@ export default {
       resultData: {},
       resultData: {},
     };
     };
   },
   },
-  mounted () { },
+  mounted () {
+    if(this.formData){
+      this.getDetailInfo()
+    }
+  },
   methods: {
   methods: {
     setResult(data){
     setResult(data){
       this.resultData = data
       this.resultData = data
+    },
+    getDetailInfo(){
+      this.$startLoading();
+      getFwmxInfo({ sqcxBsm: this.formData.bsmSqcx }).then((res) => {
+        this.$endLoading();
+        if (res.code == 200) {
+            this.resultData = res.result
+        }
+      });
+      
     }
     }
   },
   },
 };
 };

@@ -51,7 +51,7 @@ import table from "@/utils/mixin/table";
 import { popupDialog } from "@/utils/popup.js";
 import { popupDialog } from "@/utils/popup.js";
 import { datas, sendThis } from "./dydjbdata";
 import { datas, sendThis } from "./dydjbdata";
 import addDydjb from "./components/addDydjb.vue";
 import addDydjb from "./components/addDydjb.vue";
-import { getFwmxPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 export default {
 export default {
   name: "dydjb",
   name: "dydjb",
   components: { addDydjb },
   components: { addDydjb },
@@ -71,6 +71,7 @@ export default {
         cxbh: "",
         cxbh: "",
         sqr: "",
         sqr: "",
         ywh: "",
         ywh: "",
+        cxlx: '2'
       },
       },
       tableData: {
       tableData: {
         columns: datas.columns(),
         columns: datas.columns(),
@@ -82,7 +83,7 @@ export default {
     // 初始化数据
     // 初始化数据
     queryClick () {
     queryClick () {
       this.$startLoading();
       this.$startLoading();
-      getFwmxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         this.$endLoading();
         if (res.code === 200) {
         if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;
@@ -92,19 +93,20 @@ export default {
       });
       });
     },
     },
     dydjbClick (scope) {
     dydjbClick (scope) {
-      this.$nextTick(() => {
-        this.isDialog = true
-        this.sqcxBsm = scope.row.bsmSqcx
-      })
-      // popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
-      //   bsmSqcx: scope.row.bsmSqcx,
-      // });
+      // this.$nextTick(() => {
+      //   this.isDialog = true
+      //   this.sqcxBsm = scope.row.bsmSqcx
+      // })
+      popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
+        bsmSqcx: scope.row.bsmSqcx,
+      });
     },
     },
     handleSort (name, sort) {
     handleSort (name, sort) {
       console.log(name, sort);
       console.log(name, sort);
     },
     },
     openAddDialog(){
     openAddDialog(){
       this.isDialog = true
       this.isDialog = true
+      this.sqcxBsm = ''
     }
     }
   },
   },
 };
 };

@@ -63,7 +63,7 @@ class data extends filter {
         label: "操作",
         label: "操作",
         width: 100,
         width: 100,
         render: (h, scope) => {
         render: (h, scope) => {
-          return <el-button type="text" icon='el-icon-printer' onClick={() => { vm.dydjbClick(scope) }}>打印登记薄</el-button>
+          return <el-button type="text" icon='el-icon-view' onClick={() => { vm.dydjbClick(scope) }}>查看</el-button>
         }
         }
       },
       },
 
 

@@ -46,7 +46,7 @@
 <script>
 <script>
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./jtfcdata";
 import { datas, sendThis } from "./jtfcdata";
-import { getJtfcPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 import addjtfc from "./components/addjtfc.vue";
 import addjtfc from "./components/addjtfc.vue";
 export default {
 export default {
   name: "jtfc",
   name: "jtfc",
@@ -64,6 +64,7 @@ export default {
       queryForm: {
       queryForm: {
         cxbh: "",
         cxbh: "",
         sqr: "",
         sqr: "",
+        cxlx: '1'
       },
       },
       tableData: {
       tableData: {
         columns: datas.columns(),
         columns: datas.columns(),
@@ -75,7 +76,7 @@ export default {
     // 初始化数据
     // 初始化数据
     queryClick () {
     queryClick () {
       this.$startLoading();
       this.$startLoading();
-      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         this.$endLoading();
         if (res.code === 200) {
         if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;

@@ -69,7 +69,7 @@
 <script>
 <script>
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./sqcxjldata";
 import { datas, sendThis } from "./sqcxjldata";
-import { getJtfcPage } from "@/api/sqcx";
+import { getSqcxPage } from "@/api/sqcx";
 export default {
 export default {
   name: "sqcxjl",
   name: "sqcxjl",
   mixins: [table],
   mixins: [table],
@@ -94,7 +94,7 @@ export default {
     // 初始化数据
     // 初始化数据
     queryClick () {
     queryClick () {
       this.$startLoading();
       this.$startLoading();
-      getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
+      getSqcxPage({ ...this.queryForm, ...this.pageData }).then((res) => {
         this.$endLoading();
         this.$endLoading();
         if (res.code === 200) {
         if (res.code === 200) {
           let { records, total } = res.result;
           let { records, total } = res.result;