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

@@ -120,6 +120,18 @@ export function getFdcq2List (data) {
     data
   })
 }
+/**
+ * @description: 获取房屋多幢信息集合
+ * @param {*} data
+ * @author: renchao
+ */
+export function getFdcq1List (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getFdcq1List',
+    method: 'post',
+    data
+  })
+}
 
 /**
  * @description: 获取抵押权

@@ -22,6 +22,9 @@ export function getForm(tabName) {
     case "nydsyq":
       form = require("@/views/registerBook/nydsyq.vue");
       break;
+    case "fdcq1":
+      form = require("@/views/registerBook/fdcq1.vue");
+      break;
     case "fdcq2":
       form = require("@/views/registerBook/fdcq2.vue");
       break;

@@ -59,11 +59,11 @@
 <script>
   import { datas } from "./qlxxFormData.js";
   import { getSjlx } from "@/utils/dictionary.js";
-  import { getJsydsyqList } from "@/api/djbDetail.js";
+  import { getFdcq1List } from "@/api/djbDetail.js";
   export default {
     data () {
       return {
-        title: "建设用地使用权、宅基地使用权登记信息",
+        title: "房地产权登记信息（多幢）",
         qsztList: datas.columns().qsztList,
         checkList: datas.columns().checkList,
         //传递参数
@@ -73,7 +73,7 @@
         //空列值个数
         emptycolNum: datas.columns().emptycolNum,
         //列名称对象
-        columns: datas.columns().JSYDSYQ,
+        columns: datas.columns().FDCQ1,
       };
     },
     created () {
@@ -91,7 +91,7 @@
             label: "操作"
           })
         }
-        getJsydsyqList({
+        getFdcq1List({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
           qszt: this.checkList,

@@ -134,6 +134,156 @@ class data extends filter {
           label: "附记",
         },
       ],
+      FDCQ1: [
+        {
+          prop: "qszt",
+          label: "权属状态",
+        },
+        {
+          prop: "sjlx",
+          label: "数据类型",
+        },
+        {
+          prop: "qllxmc",
+          label: "权利类型",
+        },
+        {
+          prop: "djlxmc",
+          label: "登记类型",
+        },
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "dah",
+          label: "档案号",
+        },
+        {
+          prop: "ywh",
+          label: "业务号",
+        },
+        {
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
+        },
+        {
+          prop: "gyqk",
+          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: "yt",
+          label: "土地用途",
+        },
+        {
+          prop: "tdsyqx",
+          label: "土地使用期限",
+        },
+        {
+          prop: "tdsyqzsj",
+          label: "使用权起止时间",
+        },
+        {
+          prop: "fdcjyjg",
+          label: "房地产交易价格(万元)",
+        },
+        {
+          prop: "zh",
+          label: "幢号",
+        },
+        {
+          prop: "xmmc",
+          label: "项目名称",
+        },
+        {
+          prop: "zcs",
+          label: "总层数",
+        },
+        {
+          prop: "ghyt",
+          label: "规划用途",
+        },
+        {
+          prop: "ytmc",
+          label: "用途名称",
+        },
+        {
+          prop: "pzyt",
+          label: "批准用途",
+        },
+        {
+          prop: "sjyt",
+          label: "实际用途",
+        },{
+          prop: "fwjg",
+          label: "房屋结构",
+        },{
+          prop: "fwjgmc",
+          label: "房屋结构名称",
+        },{
+          prop: "jzmj",
+          label: "建筑面积",
+        },
+        {
+          prop: "jgsj",
+          label: "竣工时间",
+        },{
+          prop: "zts",
+          label: "总套数",
+        },
+        {
+          prop: "djyy",
+          label: "登记原因",
+        },
+        {
+          prop: "bdcqzh",
+          label: "不动产权证号",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "fj",
+          label: "附记",
+        },
+      ],
       FDCQ2: [
         {
           prop: "qszt",

+<!--
+ * @Description: 房屋多幢明细
+ * @Autor:
+ * @LastEditTime: 2023年07月31日 13:32:21
+-->
+<template>
+  <div>
+    <el-table
+      :data="tableDataList"
+      border
+      :pagination="false"
+      :key="key"
+      :header-cell-style="{ 'text-align': 'center' }"
+      :heightNumSetting="true"
+      :minHeight="150"
+      height="150"
+      style="width: 100%"
+    >
+      <el-table-column prop="index" width="50" :render-header="renderHeader">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.$index + 1 }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="bdcdyh" label="不动产单元号" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.row.bdcdyh }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="xmmc" label="项目名称" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.row.xmmc }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="jzmj" label="建筑面积" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.row.jzmj }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ytmc" label="用途名称" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.row.ytmc }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fwjgmc" label="房屋结构名称" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">
+            {{ scope.row.fwjgmc }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {mapGetters} from "vuex";
+
+export default {
+  computed: {
+    ...mapGetters(["dictData"]),
+  },
+  props: {
+    tableData: {
+      type: Array,
+      default: function () {
+        return [];
+      },
+    },
+    ableOperation: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      // 键名转换，方法默认是label和children进行树状渲染
+      key: 0,
+      tableDataList: []
+    };
+  },
+  mounted() {
+  },
+  watch: {
+    tableData: {
+      handler: function (val, oldVal) {
+        let that = this;
+        this.$nextTick(() => {
+          if (val.length == 0 || !val) {
+            that.tableDataList = _.cloneDeep([
+              {
+                yt: null,
+                qssj: "",
+                jssj: "",
+                tdsyqx: "",
+              },
+            ]);
+          } else {
+            that.tableDataList = _.cloneDeep(val);
+          }
+        });
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  methods: {
+    /**
+     * @description: renderHeader
+     * @author: renchao
+     */
+    renderHeader() {
+      return (
+        <div>
+          {" "}
+          {!this.ableOperation ? (
+            "序号"
+          ) : (
+            <i
+              class="el-icon-plus pointer"
+              onClick={() => {
+                this.addClick();
+              }}
+            ></i>
+          )}
+        </div>
+      );
+    }
+  },
+};
+</script>
+<style scoped lang="scss">
+.el-input {
+  border: none !important;
+}
+
+/deep/ .el-table__row {
+  border: none !important;
+}
+
+.el-date-editor.el-input {
+  width: 100%;
+}
+
+/deep/ .el-table th {
+  height: 30px !important;
+}
+</style>
+

@@ -89,6 +89,9 @@ export function getForm(tabName, djywbm) {
     case "nydsyqQlxx":
       form = require("@/views/registerBook/nydsyq.vue");
       break;
+    case "fdcq1Qlxx":
+      form = require("@/views/registerBook/fdcq1.vue");
+      break;
     case "fdcq2Qlxx":
       form = require("@/views/registerBook/fdcq2.vue");
       break;

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-02 08:52:42
+ * @LastEditTime: 2023-08-02 08:40:35
 -->
 <template>
   <div class="slxx">
@@ -134,9 +134,9 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="12" v-if="ruleForm.qlxx">
+          <el-col :span="14" v-if="ruleForm.qlxx">
             <el-form-item label="共有方式：">
-              <el-radio-group :disabled="!ableOperation"
+              <el-radio-group :disabled="!ableOperation" @change="showCZInfo"
                 v-model="ruleForm.sldy.gyfs">
                 <el-radio label="0">单独所有</el-radio>
                 <el-radio label="1">共同共有</el-radio>
@@ -145,16 +145,17 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="5">
+          <el-col :span="5">
             <el-form-item label="发证方式：">
               <el-radio-group v-model="ruleForm.slsq.fzfs" :disabled="!ableOperation">
                 <el-radio label="1">小证</el-radio>
                 <el-radio label="2">大证</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col> -->
+          </el-col>
+
 
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs == '2'">
+          <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'">
             <el-form-item label="是否分别持证：">
               <el-radio-group v-model="ruleForm.sldy.sqfbcz" :disabled="!ableOperation">
                 <el-radio label="1">是</el-radio>
@@ -162,7 +163,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6" v-show="ruleForm.sldy.gyfs == '2'">
+          <el-col :span="5" v-show="ruleForm.sldy.gyfs == '2'">
             <el-form-item label="持证人：">
               <el-select v-model="ruleForm.slsq.czr" placeholder="持证人" :disabled="!ableOperation">
                 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -287,6 +288,13 @@
       upDateQlrxxList (val) {
         this.ruleForm.qlrList = _.cloneDeep(val);
       },
+      /**
+       * @description: showCZInfo
+       * @author: renchao
+       */
+      showCZInfo () {
+        console.log(this.ruleForm.slsq.gyfs);
+      },
       // 更新权利人信息
       /**
        * @description: 更新权利人信息