Merge branch 'dev'

@@ -17,23 +17,8 @@ export function BatchInit (data) {
     case "100":
       apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/fristBatchInit";
       break;
-    case "200":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/transferInit";
-      break;
-    case "300":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/changeInit";
-      break;
     case "400":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchSave";
-      break;
-    case "500":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/riviseInit";
-      break;
-    case "901":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/renewalInit";
-      break;
-    case "902":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/replaceInit";
+      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchInit";
       break;
   }
   return request({
@@ -47,7 +32,7 @@ export function BatchInit (data) {
  * @param {*} data
  * @author: renchao
  */
-export function Init (data) {
+export function Init(data) {
   let apiUrl = "";
   switch (data.get("djlx")) {
     case "100":
@@ -83,9 +68,13 @@ export function Init (data) {
  * @param {*} data
  * @author: renchao
  */
-export function saveBatchData (data) {
+export function saveBatchData(data) {
+  let path = "/rest/ywbl/fdcq2lr/fristBatchSave";
+  if (data.slsq.djywbm.includes("400")) {
+    path = "/rest/ywbl/fdcq2lr/logoutBatchSave";
+  }
   return request({
-    url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveBatchData",
+    url: SERVER.SERVERAPI + path,
     method: 'post',
     data
   })
@@ -96,7 +85,7 @@ export function saveBatchData (data) {
  * @param {*} data
  * @author: renchao
  */
-export function saveData (data) {
+export function saveData(data) {
   return request({
     url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveData",
     method: 'post',

@@ -54,12 +54,16 @@
             label: "权利类型"
           },          
           {
+            prop: "bdcqzh",
+            label: "不动产权证号"
+          },
+          {
             prop: "qlrmc",
-            label: "被执行人"
+            label: "权利人"
           },
           {
-            prop: "bdcqzh",
-            label: "不动产权证号"
+            prop: "qlrzjhm",
+            label: "证件号码"
           },
           {
             prop: "bdcdyh",

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2024-01-22 17:08:30
+ * @LastEditTime: 2024-01-24 09:30:19
 -->
 <template>
   <div class="slxx">
@@ -56,78 +56,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
-          房屋批量情况
-          <div class="triangle"></div>
-        </div>
-        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
-          <el-col :span="8">
-            <el-form-item label="宗地面积：">
-              <div class="flex">
-                <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
-                <el-select
-                  disabled
-                  v-model="ruleForm.zdjbxx.mjdw"
-                  style="width: 68px">
-                  <el-option
-                    v-for="item in dictData['A7']"
-                    :key="item.dcode"
-                    :label="item.dname"
-                    :value="item.dcode"></el-option>
-                </el-select>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="土地性质：">
-              <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="土地用途：">
-              <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
-          <el-col :span="8">
-            <el-form-item label="房屋性质：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="房屋用途：">
-              <el-input disabled v-model="splicingFdcq2.fwxz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="房屋结构：">
-              <el-input disabled v-model="splicingFdcq2.fwjg"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.zdjbxx">
-          <el-col :span="8">
-            <el-form-item label="房屋总层数：">
-              <el-input disabled v-model="ruleForm.fdcq2List[0].zcs"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="房屋总建筑面积：">
-              <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="房屋总套数：">
-              <el-input disabled v-model="splicingFdcq2.zts"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" v-if="ruleForm.slsq">
-          <el-col :span="8">
-            <el-form-item label="竣工时间：">
-              <el-input disabled v-model="splicingFdcq2.jzmj"></el-input>
-            </el-form-item>
+        <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
+          <el-row>
+            <el-col :span="19">
+              <p>房屋信息列表</p>
             </el-col>
             <el-col :span="5">
               <el-form-item label="发证方式：" :disabled="!viewEdit">
@@ -137,12 +69,15 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <!-- <div class="triangle"></div> -->
           </el-row>
-        <div class="slxx_title title-block">
+        </div>
+        <cfBdcdyTable :tableData="ruleForm.qlxxList" />
+        <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
           权利人信息
           <div class="triangle"></div>
         </div>
-        <el-row :gutter="10">
+        <el-row :gutter="10" v-if="ruleForm.slsq.djywbm.includes('100')">
           <el-col :span="12" v-if="ruleForm.sldyList.length > 0">
             <el-form-item label="共有方式：">
               <el-radio-group
@@ -191,7 +126,7 @@
           :disabled="viewEdit"
           @upDateQlrxxList="upDateQlrxxList"
           :tableData="ruleForm.qlrList"
-          :gyfs="ruleForm.sldyList[0].gyfs" />
+          :gyfs="ruleForm.sldyList[0].gyfs" v-if="ruleForm.slsq.djywbm.includes('100')" />
         <div class="slxx_title title-block">
           登记原因
           <div class="triangle"></div>
@@ -221,6 +156,7 @@
 </template>
 <script>
   import ywmix from "@/views/ywbl/mixin/index";
+  import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import {
     BatchInit,
@@ -234,7 +170,7 @@
     computed: {
       ...mapGetters(["dictData", "flag"])
     },
-    components: { qlrCommonTable },
+    components: { qlrCommonTable, cfBdcdyTable },
     data () {
       return {
         isSave: true,
@@ -265,14 +201,6 @@
         rules: {},
         gyfs: "",
         bsmSlsq: this.$route.query.bsmSlsq, //受理申请标识码       
-        splicingFdcq2: {
-          //前端根据后台数组组装展示内容
-          tdxz: "", //土地性质
-          fwxz: "", //房屋性质
-          fwjg: "", //房屋结构
-          jzmj: "", //建筑面积
-          zts: "", //房屋总套数
-        },
       };
     },
     mounted (callbackfn, thisArg) {
@@ -300,7 +228,7 @@
             }
           })
           that.isSave = this.viewEdit
-          this.splicingFdcq2Info();
+
         } else {
           that.isSave = false
           that.$confirm(res.message, '提示', {
@@ -315,29 +243,6 @@
     },
     methods: {
       /**
-       * @description: 组装房地产权通用信息
-       * @author: renchao
-       */
-      splicingFdcq2Info () {
-        let fdcq2List = this.ruleForm.fdcq2List;
-        let fwxzArr = [];
-        let fwjgArr = [];
-        let jzmj = 0;
-        fdcq2List.forEach((fdcq2) => {
-          fwxzArr.push(fdcq2.fwxzmc);
-          fwjgArr.push(fdcq2.fwjgmc);
-          jzmj += parseFloat(fdcq2.jzmj);
-        });
-        //房屋性质
-        let fwxz = Array.from(new Set(fwxzArr)).join(",");
-        //房屋结构
-        let fwjg = Array.from(new Set(fwjgArr)).join(",");
-        this.splicingFdcq2.fwxz = fwxz;
-        this.splicingFdcq2.fwjg = fwjg;
-        this.splicingFdcq2.jzmj = jzmj == null ? 0 : jzmj;
-        this.splicingFdcq2.zts = fdcq2List.length;
-      },
-      /**
        * @description: 更新权利人信息
        * @param {*} val
        * @author: renchao