Merge branch 'dev'

@@ -12,8 +12,12 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
  * @author: renchao
  * @author: renchao
  */
  */
 export function Init (data) {
 export function Init (data) {
+    let apiUrl = "/rest/ywbl/zjgcdy/init";
+    if (data.get("djlx") == "400") {
+        apiUrl = "/rest/ywbl/zjgcdy/logoutInit";
+    }
     return request({
     return request({
-        url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/init",
+        url: SERVER.SERVERAPI + apiUrl,
         method: 'post',
         method: 'post',
         data
         data
     })
     })

 <!--
 <!--
  * @Description: 审批意见
  * @Description: 审批意见
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-23 17:19:05
+ * @LastEditTime: 2024-01-26 08:46:38
 -->
 -->
 <template>
 <template>
   <div class="spyj" v-Loading="loading">
   <div class="spyj" v-Loading="loading">
@@ -30,7 +30,7 @@
                       type="textarea"
                       type="textarea"
                       :rows="4"
                       :rows="4"
                       class="opinion"
                       class="opinion"
-                      placeholder="请输入审批意见"
+                      placeholder=""
                       v-model="item.shyj"></el-input>
                       v-model="item.shyj"></el-input>
                     <el-button
                     <el-button
                       class="opinion_btn"
                       class="opinion_btn"

@@ -59,7 +59,7 @@
         <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
         <div class="slxx_title title-block" v-if="ruleForm.slsq.djywbm.includes('100')">
           <el-row>
           <el-row>
             <el-col :span="19">
             <el-col :span="19">
-              <p>房屋信息列表</p>
+              <p>房屋信息列表（{{ ruleForm.hlist.length }} 户）</p>
             </el-col>
             </el-col>
             <el-col :span="5">
             <el-col :span="5">
               <el-form-item label="发证方式：" :disabled="!viewEdit">
               <el-form-item label="发证方式：" :disabled="!viewEdit">

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-25 14:15:55
+ * @LastEditTime: 2024-01-26 08:32:16
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -190,9 +190,7 @@
         <el-row :gutter="10">
         <el-row :gutter="10">
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="是否永久基本农田：">
             <el-form-item label="是否永久基本农田：">
-              <el-radio-group
-                v-model="ruleForm.tdcbjyq.sfyjjbnt"
-                :disabled="!viewEdit">
+              <el-radio-group v-model="ruleForm.tdcbjyq.sfyjjbnt" :disabled="!viewEdit">
                 <el-radio label="1">是</el-radio>
                 <el-radio label="1">是</el-radio>
                 <el-radio label="0">否</el-radio>
                 <el-radio label="0">否</el-radio>
               </el-radio-group>
               </el-radio-group>

@@ -55,7 +55,8 @@
           抵押户信息列表信息（{{ ruleForm.hlist.length }} 户）
           抵押户信息列表信息（{{ ruleForm.hlist.length }} 户）
           <div class="triangle"></div>
           <div class="triangle"></div>
         </div>     
         </div>     
-        <qjhTable :tableData="ruleForm.hlist" />
+        <cfBdcdyTable :tableData="ruleForm.qlxxList"  v-if="ruleForm.slsq.djywbm.includes('400')"/>
+        <qjhTable v-else :tableData="ruleForm.hlist" />
         <div class="slxx_title title-block">
         <div class="slxx_title title-block">
           抵押信息
           抵押信息
           <div class="triangle"></div>
           <div class="triangle"></div>
@@ -293,6 +294,7 @@
 </template>
 </template>
 <script>
 <script>
   import qjhTable from "@/views/workflow/components/qjhTable";
   import qjhTable from "@/views/workflow/components/qjhTable";
+  import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
   import { bacthInit, saveBatchData } from "@/api/workflow/zjgcdyFlow.js";
   import { mapGetters } from "vuex";
   import { mapGetters } from "vuex";
@@ -333,7 +335,7 @@
         this.loading = false
         this.loading = false
       })
       })
     },
     },
-    components: { qlrCommonTable, qjhTable },
+    components: { qlrCommonTable, qjhTable,cfBdcdyTable },
     computed: {
     computed: {
       ...mapGetters(["dictData", "flag"]),
       ...mapGetters(["dictData", "flag"]),
     },
     },