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

 /*
  * @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
+    })
+}
+
+

@@ -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

@@ -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-18 11:11:19
+ * @LastEditTime: 2023-09-20 16:56:46
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
@@ -157,20 +157,30 @@ 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)
             }
           })
-            .catch((err) => {
-              this.$message.error(err)
-            });
+          .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":

@@ -342,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') {

 <!--
  * @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