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

 import request from '@/utils/request'
 
 // 初始化内容
-export function Init (data) {
+export function Init(data) {
+    let apiUrl = "";
+    switch (data.get("djlx")) {
+        case "100":
+            apiUrl = "/ywbl/fdcq2lr/fristInit";
+            break;
+        case "200":
+            apiUrl = "/ywbl/fdcq2lr/transferInit";
+            break;
+        case "300":
+            apiUrl = "/ywbl/fdcq2lr/changeInit";
+            break;
+        case "400":
+            apiUrl = "/ywbl/fdcq2lr/logoutInit";
+            break;
+        case "500":
+            apiUrl = "/ywbl/fdcq2lr/riviseInit";
+            break;
+        case "901":
+            apiUrl = "/ywbl/fdcq2lr/renewalInit";
+            break;
+        case "902":
+            apiUrl = "/ywbl/fdcq2lr/replaceInit";
+            break;
+    }
     return request({
-        url: '/ywbl/fwsyqlr/Init',
+        url: apiUrl,
+        method: 'post',
+        data
+    })
+}
+// 初始化内容
+export function saveData(data) {
+    return request({
+        url: '/ywbl/fdcq2lr/saveData',
         method: 'post',
         data
     })

+import request from '@/utils/request'
+/* 
+  楼盘查询
+*/
+
+
+// 根据条件进行列表查询
+export function getLpZrz(data) {
+  return request({
+    url: '/zhcx/lpcx/getLpZrz',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 获取楼盘表
+export function getLpb(params) {
+  return request({
+    url: '/zhcx/lpcx/getLpb/',
+    method: 'get',
+    params
+  })
+}
+
+

@@ -52,7 +52,7 @@ import { datas } from "./qlxxFormData.js";
 export default {
   data() {
     return {
-      title: "建设用地使用权、宅基地使用权登记信息",
+      title: "房地产权登记信息（独幢、层、套、间房屋）",
       qsztList: datas.columns().qsztList,
       checkList: datas.columns().checkList,
       //传递参数
@@ -62,7 +62,7 @@ export default {
       //空列值个数
       emptycolNum: datas.columns().emptycolNum,
       //列名称对象
-      columns: datas.columns().JSYDSYQ,
+      columns: datas.columns().FDCQ2,
     };
   },
   created() {

@@ -130,6 +130,141 @@ class data extends filter {
           label: "附记",
         },
       ],
+      FDCQ2: [
+        {
+          prop: "qszt",
+          label: "权属状态",
+        },
+        {
+          prop: "qllxmc",
+          label: "权利类型",
+        },
+        {
+          prop: "djlxmc",
+          label: "登记类型",
+        },
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "dah",
+          label: "档案号",
+        },
+        {
+          prop: "ywh",
+          label: "业务号",
+        },
+        {
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
+        },
+        {
+          prop: "gyfs",
+          label: "共有情况",
+        },
+        {
+          prop: "qlrlx",
+          label: "权利人类型",
+        },
+        {
+          prop: "qlrmc",
+          label: "权利人",
+        },
+        {
+          prop: "qlrzjzl",
+          label: "证件种类",
+        },
+        {
+          prop: "qlrzjhm",
+          label: "证件号",
+        },
+        {
+          prop: "tdsyqr",
+          label: "土地使用权人",
+        },
+        {
+          prop: "dytdmj",
+          label: "独用土地面积(m²)",
+        },
+        {
+          prop: "fttdmj",
+          label: "分摊土地面积(m²)",
+        },
+        {
+          prop: "tdsyqzsj",
+          label: "土地使用期限",
+        },       
+        {
+          prop: "syqqzsj",
+          label: "使用权起止时间",
+        },
+        {
+          prop: "fdcjyjg",
+          label: "房地产交易价格(万元)",
+        },
+        {
+          prop: "ytmc",
+          label: "规划用途",
+        },
+        {
+          prop: "fwxzmc",
+          label: "房屋性质",
+        },
+        {
+          prop: "fwjgmc",
+          label: "房屋结构",
+        },
+        {
+          prop: "szc",
+          label: "所在层",
+        },
+        {
+          prop: "zcs",
+          label: "总层数",
+        },
+        {
+          prop: "mj",
+          label: "建筑面积（m2）",
+        },
+        {
+          prop: "zyjzmj",
+          label: "专有建筑面积（m2）",
+        },
+       
+        {
+          prop: "ftjzmj",
+          label: "分摊建筑面积（m2）",
+        },
+        {
+          prop: "jgsj",
+          label: "竣工时间",
+        },
+        {
+          prop: "djyy",
+          label: "登记原因",
+        },
+        {
+          prop: "bdcqzh",
+          label: "不动产权证号",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "fj",
+          label: "附记",
+        },
+      ],
       DYAQ: [
         {
           prop: "qszt",

@@ -4,12 +4,12 @@
     <div class="from-clues-header">
       <el-form ref="queryForm" label-width="90px">
         <ul style="margin-bottom:15px">
-          <li v-for="(item,index) in list" class="listDetail">
+          <li v-for="(item,index) in dataList" class="listDetail" :key="index">
             <p class="icon">
               <i class="el-icon-circle-check"></i>
             </p>
-            <p>{{item.title}}</p>
-            <p>{{item.value}}</p>
+            <p>{{item.activityName}}</p>
+            <p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
           </li>
         </ul>
         <el-form-item label="退回意见:">
@@ -24,27 +24,31 @@
 import { getTaskBackNode, sendBackTask } from "@/api/fqsq.js"
 export default {
   props: {
+    formData: {
+      type: Object,
+      default: {}
+    }
   },
   data () {
     return {
-      list: [
-        {
-          title: "初审",
-          value: '',
-        },
-        {
-          title: "复审",
-          value: '',
-        },
-        {
-          title: "录入",
-          value: '',
-        }
-      ],
+      dataList: [],
       outstepopinion: ''
     }
   },
+  created() {
+    this.getBackNode();
+  },
   methods: {
+    childFn () {
+      console.log(1111);
+    },
+    getBackNode() {
+      getTaskBackNode(this.formData).then(res => {
+        if(res.code == 200){
+          this.dataList = res.result
+        }
+      })
+    }
   }
 }
 </script>

 //流程环节操作按钮
-export function getForm (tabName) {
+export function getForm(tabName, djywbm) {
     let form;
     switch (tabName) {
         case "slxx":
-            form = require("@/views/ywbl/jsydsyq/slxx.vue");
+            form = require("@/views/ywbl/jsydsyq/slxx200.vue");
+            break;
+        case "fdcq2Slxx":
+            form = require("@/views/ywbl/fdcq2/slxx200.vue");
             break;
         case "slxxCfdj":
             form = require("@/views/ywbl/cfdj/slxx.vue");
@@ -20,6 +23,9 @@ export function getForm (tabName) {
         case "qlxx":
             form = require("@/views/registerBook/jsydsyq.vue");
             break;
+        case "fdcq2Qlxx":
+            form = require("@/views/registerBook/fdcq2.vue");
+            break;
         case "szxx":
             form = require("@/views/workflow/components/szxx.vue");
             break;
@@ -27,7 +33,5 @@ export function getForm (tabName) {
             form = require("@/views/workflow/components/fzxx.vue");
             break;
     }
-
     return (r) => require.ensure([], () => r(form));
 }
-

@@ -212,7 +212,7 @@ export default {
           this.tabList.forEach(function (item, index) {
             if (item.value == "clxx") {
               that.clxxIndex = index;
-              that.clxxForm = getForm(item.value);
+              that.clxxForm = getForm(item.value,that.$route.query.sqywbm);
               that.clxxTab = item;
             }
           });
@@ -319,7 +319,10 @@ export default {
             editItem: "workflow/components/th",
             height: "330px",
             width: '30%',
-            formData: {},
+            formData: {
+              bsmSlsq: this.bsmSlsq,
+              bestepid: this.bestepid
+            },
             btnShow: true,
             cancel: () => {
               console.log("取消回调");
@@ -387,7 +390,7 @@ export default {
     },
     //切换选项卡内容组件
     getFromRouter (tabname) {
-      this.componentTag = getForm(tabname);
+      this.componentTag = getForm(tabname,this.$route.query.sqywbm);
     },
     //发送下一个环节
     send (obj) {

@@ -40,7 +40,7 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" @sort-change="handleSort" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current"
         :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
@@ -50,6 +50,7 @@
 <script>
 import table from "@/utils/mixin/table";
 import { datas, sendThis } from "./lpcxdata";
+import { getLpZrz,getLpb } from "@/api/lpb.js"
 export default {
   name: "lpcx",
   components: {},
@@ -66,33 +67,49 @@ export default {
         zrzh: "",
       },
       pageData: {
-        current: 1,
-        size: 10,
-        total: 2,
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
       },
-      ywlys: datas.ywlys(),
       tableData: {
         columns: datas.columns(),
-        data: [
-          {
-            slsj: "2022-5-12",
-          },
-          {
-            slsj: "2022-5-13",
-          },
-        ],
-      },
+        data: []
+      }
     };
   },
   methods: {
+    //查询
+    queryClick(){
+      this.fetchData();
+    },
+
     // 初始化数据
     fetchData () {
+      getLpZrz({ ...this.queryForm, ...this.pageData }).then(res => {
+        if (res.code === 200) {          
+          this.pageData.total = res.result.total;
+          this.tableData.data = res.result.records
+        }
+      })
     },
+
     handleSort (name, sort) {
       console.log(name, sort);
     },
-    openDialog () {
-      console.log(999999999999999);
+
+    //打开楼盘表
+    openlpbDialog (scope) {
+      debugger;
+      var zrzbsm=scope.row.bsm;
+
+      getLpb({zrzbsm:zrzbsm}).then(res => {
+        if(res.code == 200){
+          var lpbdata = res.result;
+        }
+      })
+      .catch((error) => {
+          console.log(error);
+        });
     },
   },
 };

@@ -40,7 +40,7 @@ class data extends filter {
         label: "用途",
       },
       {
-        prop: "mj",
+        prop: "zydmj",
         label: "面积(㎡)",
       },
       {
@@ -57,21 +57,11 @@ class data extends filter {
         align: 'center',
         fixed: 'right',
         render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openDialog(scope) }}>楼盘表</el-button>
+          return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openlpbDialog(scope) }}>楼盘表</el-button>
         }
       }
     ]
   }
-
-  ywlys () {
-    return [
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
-    ]
-  }
-
 }
 let datas = new data()
 export {