Merge branch 'dev'

 /*
  * @Description: 企业银行接口
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 17:08:10
+ * @LastEditTime: 2023-09-20 14:49:22
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -109,3 +109,19 @@ export function editCompanyMaterialList (data, bsmCompany) {
     data
   })
 }
+
+/**
+ * @description: 是否覆盖才材料信息
+ * @author: renchao
+ */
+export function replace (bsmCompany, bsmSldy, bsmSlsq) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/company/replace',
+    method: 'get',
+    params: {
+      bsmCompany: bsmCompany,
+      bsmSldy: bsmSldy,
+      bsmSlsq: bsmSlsq
+    }
+  })
+}
\ No newline at end of file

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:32:45
+ * @LastEditTime: 2023-09-20 10:24:29
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -108,3 +108,19 @@ export function sjClmxDelete (bsmClmx) {
         method: 'delete'
     })
 }
+
+
+/**
+ * @description: 获取自然幢列表
+ * @param {*} data
+ * @author: renchao
+ */
+export function getZrzListByBsmSlsq (params) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/zjgcdy/getZrzListByBsmSlsq',
+        method: 'get',
+        params
+    })
+}
+
+

@@ -246,3 +246,14 @@
 .messageIndex {
   z-index: 8000 !important;
 }
+
+// el-link一直显示下划线
+.el-link.is-underline::after {
+  content: "";
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 0;
+  bottom: 0;
+  border-bottom: 1px solid #1890ff;
+}
\ No newline at end of file

@@ -2,7 +2,7 @@
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 15:16:49
+ * @LastEditTime: 2023-09-20 14:20:39
  */
 import axios from 'axios'
 import Router from '@/router'
@@ -77,7 +77,7 @@ service.interceptors.response.use(
                     Router.replace({
                         path: '/login',
                         query: {
-                            redirect: Router.currentRoute.value.fullPath
+                            redirect: Router.currentRoute.fullPath
                         }
                     })
                     return false

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-28 15:47:12
  * @LastEditors: yangwei
- * @LastEditTime: 2023-09-15 14:52:50
+ * @LastEditTime: 2023-09-20 17:14:39
  * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
  * @Description:
  *
@@ -16,16 +16,14 @@
       border="1"
       cellspacing="0"
       cellpadding="0"
-      v-show="ch.length"
-    >
+      v-show="ch.length">
       <tr v-for="(cs, csIndex) in ch" :key="csIndex">
         <!-- 显示层数 -->
         <td
           class="floor"
           ref="cBsm"
           @contextmenu.prevent="openMenu($event, cs, 'c')"
-          @click="handleClickC($event, cs)"
-        >
+          @click="handleClickC($event, cs)">
           {{ cs.sjc }}层
         </td>
         <!-- 显示户 -->
@@ -41,18 +39,11 @@
           :class="hs.select ? 'tdSelect' : ''"
           @click="handleClickH($event.target, hs.bsm, hs)"
           @dblclick="dbclick(hs.bsm)"
-          @contextmenu.prevent="openMenu($event, hs, 'h')"
-        >
+          @contextmenu.prevent="openMenu($event, hs, 'h')">
           {{ hs.shbw }}
-          <span @click.stop="" class="hqszt lin" v-show="hs.qszt == '0'"
-            >临</span
-          >
-          <span @click.stop="" class="hqszt zheng" v-show="hs.qszt == '1'"
-            >正</span
-          >
-          <span @click.stop="" class="hqszt xian" v-show="hs.qszt == '2'"
-            >现</span
-          >
+          <span @click.stop="" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
+          <span @click.stop="" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
+          <span @click.stop="" class="hqszt xian" v-show="hs.qszt == '2'">现</span>
           <ul @click.stop="hDyztClick($event, hs.bsm, hs)" class="dyzt">
             <li style="background-color: #6edee1" v-show="hs.qqzt == '1'">
               确
@@ -318,9 +309,8 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
-.ch-wrap {
+  .ch-wrap {
     display: flex;
     flex-direction: column-reverse;
     .chTable {
@@ -392,8 +382,8 @@ export default {
           }
         }
         .tdSelect {
-        border: 1px solid ;
-        border-color: #5A78DE !important;
+          border: 1px solid;
+          border-color: #5a78de !important;
           background-image: url("./images/tdSelect.png");
           background-repeat: no-repeat;
           background-position: right top;
@@ -405,5 +395,5 @@ export default {
         }
       }
     }
-}
+  }
 </style>

@@ -19,7 +19,7 @@
       }}</el-checkbox>
     </p>
     <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button>
-    <el-button type="primary" class="save-btn" v-if="!onlyShow" @click="submitForm" :loading="loading">发起申请</el-button>
+    <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button>
     <!-- 右键菜单 -->
     <ul
       v-show="lpbChVisible"

@@ -41,11 +41,24 @@
           {
             prop: "bdcdyh",
             label: "不动产单元号",
+            width: '250',
+          },
+          {
+            prop: "qllxmc",
+            label: "权利类型",
+          },
+          {
+            prop: "jzwmc",
+            label: "建筑物名称",
+          },
+          {
+            prop: "xmmc",
+            label: "项目名称",
           },
           {
             prop: "zl",
             label: "坐落",
-          },
+          }
         ],
         dataList: [],
         selectBdcdy: [],

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 10:06:22
+ * @LastEditTime: 2023-09-20 16:07:43
 -->
 <template>
   <dialogBox
@@ -286,13 +286,12 @@
         </el-table-column>
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
-            <el-button type="text" @click="handlesQYSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handleSelect(scope.row)">使用</el-button>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination background layout="prev, pager, next,total" :total="tableDataQy.total"
         @current-change="handleQYCurrentChange"></el-pagination>
-
     </div>
 
     <div v-if="activeName==3" class="padding10">
@@ -327,7 +326,7 @@
         </el-table-column>
         <el-table-column label="操作" width="50">
           <template slot-scope="scope">
-            <el-button type="text" @click="handlesYHSelect(scope.row)">使用</el-button>
+            <el-button type="text" @click="handleSelect(scope.row)">使用</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -341,6 +340,7 @@
   import { mapGetters } from "vuex";
   import store from '@/store/index.js'
   import { getUuid } from "@/utils/operation.js"
+  import { replace } from "@/api/company.js"
   import { getIdCardInfo } from '@/utils/operation.js'
   import { queryQyByPage, queryYhByPage, addQy } from "@/api/xxba.js";
   import { dataYh, dataQy, sendThis } from "../../javascript/addQlrData";
@@ -535,9 +535,31 @@
        * @param {*} val
        * @author: renchao
        */
-      handlesQYSelect (val) {
-        this.$emit("updateDetail", _.cloneDeep(val));
-        this.$emit("input", false);
+      handleSelect (val) {
+        let that = this
+        let bsmSldy = window.currentSelect.bsmSldy ? window.currentSelect.bsmSldy : ''
+        this.$confirm('是否同步材料信息?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
+            that.$emit("updateDetail", _.cloneDeep(val));
+            that.$emit("input", false);
+            if (res.code == 200) {
+              that.$message({
+                type: 'success',
+                message: '同步成功!'
+              })
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
       },
       /**
        * @description: 银行信息搜索
@@ -570,15 +592,6 @@
         this.handleSearchQY()
       },
       /**
-       * @description: handlesYHSelect
-       * @param {*} val
-       * @author: renchao
-       */
-      handlesYHSelect (val) {
-        this.$emit("updateDetail", _.cloneDeep(val));
-        this.$emit("input", false);
-      },
-      /**
        * @description: 身份证打卡器
        * @author: renchao
        */
@@ -610,7 +623,9 @@
        */
       closeDialog () {
         this.$emit("input", false);
+        this.$nextTick(() => {
           this.$refs["ruleForm"].resetFields();
+        })
       },
       /**
        * @description: submitForm

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 16:13:24
+ * @LastEditTime: 2023-09-20 15:46:25
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -209,6 +209,7 @@
        * @author: renchao
        */
       batchUnitClick () {
+        window.currentSelect = {}
         this.currentSelectProps.batchOperation = true;
         this.activeIndex = "-1";
         this.$parent.stepForm(0);
@@ -230,6 +231,7 @@
        * @author: renchao
        */
       unitClick (index) {
+        window.currentSelect = this.unitData[index]
         if (this.unitData.length == 0) return
         this.currentSelectProps = this.unitData[index];
         this.currentSelectProps.batchOperation = false;

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 16:15:15
+ * @LastEditTime: 2023-09-20 15:33:05
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -218,6 +218,7 @@
        * @author: renchao
        */
       unitClick (index) {
+        window.currentSelect = this.unitData[index]
         this.activeHIndex = '-1'
         this.currentSelectProps = this.aroundUnitData[index];
         this.currentSelectProps.issave = '1'
@@ -234,6 +235,7 @@
        * @author: renchao
        */
       handleAfterunitClick (index) {
+        window.currentSelect = this.unitData[index]
         this.activeIndex = '-1'
         this.currentSelectProps = this.afterUnitData[index];
         this.currentSelectProps.batchOperation = false;

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:11:19
+ * @LastEditTime: 2023-09-20 16:56:46
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
@@ -157,12 +157,15 @@ export default {
           )
           break;
         case "B8":
-          getZrzbsmList(this.bsmSlsq).then((res) => {
+          !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
             if (res.code === 200) {
               this.$popupDialog('楼盘表', 'lpb/index', {
                 bsm: res.result[0],
                 onlyShow: false,
-                unitData: window.unitData
+                unitData: window.unitData,
+                bsmSlsq:this.bsmSlsq,
+                showSave:true,
+                djlx: window.djlx
               }, '90%', true)
             } else {
               this.$message.error(res.message)
@@ -171,6 +174,13 @@ export default {
           .catch((err) => {
             this.$message.error(err)
           });
+          window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', {
+            onlyShow: false,
+            unitData: window.unitData,
+            bsmSlsq:this.bsmSlsq,
+            showSave:true,
+            djlx: window.djlx
+          }, '90%', true)
           break;
         // 图形定位
         case "B-TXDW":

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:13:06
+ * @LastEditTime: 2023-09-20 17:30:41
 -->
 <template>
   <div class="container">
@@ -117,27 +117,24 @@
        * @author: renchao
        */
       stepForm (index) {
+        let that = this
         this.currentSelectProps.type = "READ_ONLY"
         getStepFormInfo(this.currentSelectProps).then((res) => {
           if (res.code === 200) {
             //获取单元对应的所有表单信息
             this.tabList = res.result;
             //默认加载第一个表单信息
-            let arr = res.result.filter(item => item.defaultForm)
-            if (arr.length > 0) {
-              this.tabName = arr[0].value;
-            } else {
-              this.tabName = res.result[0].value;
+            if (res.result.length > 0) {
+              that.tabName = res.result[0].value;
             }
             if (sessionStorage.getItem('activeName') == this.tabName) {
-              this.fresh++;
+              that.fresh++;
             }
             this.ableOperation = this.tabList[0].ableOperation
             //批量操作无分屏按钮
             if (index != null) {
               //处理分屏材料信息
-              let that = this;
-              this.tabList.forEach(function (item, index) {
+              that.tabList.forEach(function (item, index) {
                 if (item.value == "clxx") {
                   that.clxxIndex = index
                   that.clxxForm = getForm(item.value)

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-28 15:48:06
+ * @LastEditTime: 2023-09-20 17:17:22
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -62,7 +62,7 @@ class data extends filter {
         align: 'center',
         minWidth: '100',
         render: (h, scope) => {
-          return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
+          return <el-link type="primary" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-link>
         }
       },
       {

@@ -204,7 +204,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-
           <el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'">
             <el-form-item label="是否分别持证：">
               <el-radio-group
@@ -373,7 +372,7 @@
           if (this.ruleForm.qlrList.length > 1) {
             this.$message({
               showClose: true,
-              message: "共有方式：单独所有，权利人只能是一个人",
+              message: "共有方式：单独所有，抵押权人只能是一个人",
               type: "error",
             });
             return false;
@@ -384,7 +383,7 @@
             this.$message({
               showClose: true,
               message:
-                "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
+                "共有方式：共同所有，按份所有，其他所有，抵押权人必须是两个以上",
               type: "error",
             });
             return false;
@@ -439,7 +438,7 @@
         this.czr = "";
       },
       /**
-       * @description: 更新权利人信息
+       * @description: 更新抵押权人信息
        * @param {*} val
        * @author: renchao
        */

@@ -143,10 +143,11 @@
         <el-row :gutter="10">
           <el-col :span="8" v-show="ruleForm.diyaq.dyfs == 1">
             <el-form-item label="被担保主债权数额：">
+              <div style="display:flex">
                 <el-input
                   v-model="ruleForm.diyaq.bdbzzqse"
                   :disabled="!viewEdit"></el-input>
-              <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit">
+                <el-select style="width: 68px" v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit">
                   <el-option
                     v-for="item in dictData['A57']"
                     :key="item.dcode"
@@ -154,6 +155,7 @@
                     :value="item.dcode">
                   </el-option>
                 </el-select>
+              </div>
             </el-form-item>
           </el-col>
 
@@ -229,7 +231,7 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="14">
+          <el-col :span="12">
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!viewEdit"
@@ -340,6 +342,8 @@
         this.loading = false
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
+          window.djlx = res.result.sldy.djlx
+          this.czrOptions = this.ruleForm.qlrList;
           this.ruleForm.qlrList.forEach((item) => {
             item.id = item.bsmSqr
             if (item.sfczr == '1') {

@@ -54,9 +54,9 @@ class data extends filter {
       },
       {
         label: "业务号",
-        width: '90',
+        width: '100',
         render: (h, scope) => {
-          return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
+          return <el-link type="primary" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-link>
         }
       },
       {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:47:48
+ * @LastEditTime: 2023-09-21 09:05:06
 -->
 <template>
   <div class="from-clues">
@@ -53,8 +53,8 @@
 
             <el-col :span="3" class="btnColRight">
               <el-form-item>
-                <el-button type="primary" @click="resetForm(true)">重置</el-button>
                 <el-button type="primary" @click="handleSearch">查询</el-button>
+                <el-button type="primary" @click="resetForm(true)">重置</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -305,10 +305,10 @@
       handleLpbClick (item) {
         ywPopupDialog('楼盘表', 'lpb/index', {
           bsm: item.bsm,
-            bsmSqyw:this.sqywInfo.bsmSqyw,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
           onlyShow: false,
-            scyclx:1
-        }, '85%', true,false)
+          scyclx: 1
+        }, '85%', true, false)
       },
       /**
        * @description: select
@@ -336,7 +336,7 @@
         let refs = 'table1';
         if (this.activeName == 'dz') {
           refs = 'table';
-        }else{
+        } else {
           this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection()
         }
         const bdcdysz = this.bdcdysz
@@ -344,7 +344,7 @@
           bdcdysz.forEach(item => {
             // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
             if (item == row) {
-              this.$nextTick(()=>{this.$refs[refs].toggleRowSelection(row, false);})
+              this.$nextTick(() => { this.$refs[refs].toggleRowSelection(row, false); })
             }
             // 不然就让当前的一行勾选
             else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:59:52
+ * @LastEditTime: 2023-09-21 08:59:20
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -10,27 +10,26 @@
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="不动产权证号">
-              <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px">
+              <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="不动产单元号">
-              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width200px">
+              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="坐落">
-              <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width200px">
+              <el-input placeholder="" v-model.trim="queryForm.zl" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="2" class="btnColRight">
+          <el-col :span="6" class="btnColRight">
             <el-form-item>
-              <!-- <el-button type="primary" @click="resetForm">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 10:01:27
+ * @LastEditTime: 2023-09-20 17:08:30
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -38,7 +38,7 @@
     </div>
     <!-- 表格 -->
     <div class="loadingtext">
-      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="210"
+      <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="this.zrzbsm ? 390 : 290"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange" @select="select"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
@@ -52,7 +52,7 @@
 </template>
 <script>
   import store from '@/store/index.js'
-  import { ywPopupDialog,ywPopupCacel } from "@/utils/popup.js";
+  import { ywPopupDialog,popupCacel } from "@/utils/popup.js";
   import { datas, sendThis } from "../javascript/selectAllHInfo.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
@@ -64,7 +64,10 @@
     props: {
       isJump: { type: Boolean, default: false },
       sqywInfo: { type: Object, default: () => { } },
-
+      zrzbsm: {
+        type: String,
+        default: "",
+      },
     },
     data () {
       return {
@@ -88,7 +91,7 @@
        */
       queryClick () {
         this.$startLoading();
-        this.queryForm.zrzbsm = this.sqywInfo.bsm;
+        this.queryForm.zrzbsm = this.zrzbsm || this.sqywInfo.bsm;
         // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm;
         selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => {
           this.$endLoading();
@@ -143,7 +146,7 @@
        * @author: renchao
        */
       close(){
-        ywPopupCacel()
+        popupCacel()
       },
       /**
        * @description: handleSelectionChange