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

@@ -6,53 +6,74 @@
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
     <div v-if="this.isShowdrawer">
-    <el-menu :default-active="activeIndex" @select="djbClick" class="title-batch">
+      <el-menu
+        @select="djbClick"
+        class="title-batch"
+      >
         <el-menu-item index="-1" key="-1" class="menus">
           <div>登记簿</div>
         </el-menu-item>
       </el-menu>
       <div class="blxx">
-         <el-menu :default-active="activeIndex" @select="blxxClick"  class="title-batch">
+        <el-menu
+          @select="blxxClick"
+          class="title-batch"
+        >
           <el-menu-item index="-1" key="-1" class="menus">
             <div>补录信息</div>
           </el-menu-item>
         </el-menu>
         <el-menu :default-active="activeIndex" @select="unitClick">
-        <el-menu-item v-for="(item, index) in supplementarylist" :index="index.toString()" :key="index">
+          <el-menu-item
+            v-for="(item, index) in supplementarylist"
+            :index="index.toString()"
+            :key="index"
+          >
             <div>
-            <p>{{ item.qllxmc }} ||{{ item.operate }} </p>
+              <p>{{ item.qllxmc }} ||{{ item.operate }}</p>
               <!-- <p class="title-detail">{{ item.zl }}</p> -->
             </div>
-          <i class="el-icon-delete" v-if="supplementarylist.length > 1" @click.stop="handleDel(item)"></i>
+            <i
+              class="el-icon-delete"
+              v-if="supplementarylist.length > 1"
+              @click.stop="handleDel(item)"
+            ></i>
           </el-menu-item>
         </el-menu>
       </div>
-
     </div>
-    <div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click="
+    <div
+      class="map-drawer-click map-drawer"
+      v-if="!isShowdrawer"
+      @click="
         () => {
           this.isShowdrawer = !this.isShowdrawer;
         }
-        "></div>
-    <div class="map-drawer-expand map-drawer" v-else @click="
+      "
+    ></div>
+    <div
+      class="map-drawer-expand map-drawer"
+      v-else
+      @click="
         () => {
           this.isShowdrawer = !this.isShowdrawer;
         }
-        "></div>
+      "
+    ></div>
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex'
-  import { leftMenu } from "@/api/fqsq.js"
-   import { deleteRepairRecord } from "@/api/djbbl.js"
-     import { leftMenubl } from "@/api/djbbl.js"
-  import { deleteSlbdcdy } from "@/api/ywbl.js";
-  import { getBdcqljqtsx } from "@/api/registerBook.js";
+import { mapGetters } from "vuex";
+import { leftMenu } from "@/api/fqsq.js";
+import { deleteRepairRecord } from "@/api/djbbl.js";
+import { leftMenubl } from "@/api/djbbl.js";
+import { deleteSlbdcdy } from "@/api/ywbl.js";
+import { getBdcqljqtsx } from "@/api/registerBook.js";
 import { loadTreeData, getNode } from "./djbFrameData.js";
-  export default {
-    data () {
+export default {
+  data() {
     return {
-        supplementarylist:[],
+      supplementarylist: [],
       //受理申请标识码
       bsmSlsq: this.$route.query.bsmSlsq,
       //当前流程所在环节
@@ -61,13 +82,13 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
       bdcdyid: this.$route.query.bdcdyid,
       //当前流程所在环节
       bdcdyh: this.$route.query.bdcdyh,
-        qllx:this.$route.query.qllx,
+      qllx: this.$route.query.qllx,
       // 默认选中
-        activeIndex: '0',
+      activeIndex: "0",
       // 折叠
       isShowdrawer: true,
       //批量操作按钮名称
-        batchButtonName: '',
+      batchButtonName: "",
       //左侧菜单数据集合
       unitData: [],
       // 设置表单传递数据
@@ -81,93 +102,111 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
         label: "label",
       },
       showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
-      }
+    };
   },
-    mounted () {
+  mounted() {
     this.loadBdcdylist();
   },
   computed: {
-      ...mapGetters(['isRefresh'])
+    ...mapGetters(["isRefresh"]),
   },
   watch: {
     isRefresh: {
-        handler (newVal, oldVal) {
-          if (newVal) this.loadBdcdylist()
+      handler(newVal, oldVal) {
+        if (newVal) this.loadBdcdylist();
+      },
+      immediate: true,
     },
-        immediate: true
-      }
   },
   methods: {
     //读取申请单元信息
-      loadBdcdylist () {
+    loadBdcdylist() {
       var formdata = new FormData();
       formdata.append("bsmSlsq", this.bsmSlsq);
       formdata.append("bestepid", this.bestepid);
       leftMenu(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.currentSelectProps = res.result[0];
-             this.$emit('getCurrentSelectProps', this.currentSelectProps);
+          this.$emit("getCurrentSelectProps", this.currentSelectProps);
         }
-        })
-        this.getleftMenubl()
+      });
+      this.getleftMenubl();
     },
     // 获取右侧菜单
-      getleftMenubl(){
-      //   var formdata = new FormData();
-      //  formdata.append("bsmSlsq", this.bsmSlsq);
+    getleftMenubl(row) {
        leftMenubl(this.bsmSlsq).then((res) => {
-        this.supplementarylist=res.result;
+        this.supplementarylist = res.result;
+        if(row){
+          this.supplementarylist.forEach((item,index) => {
+            if(item.bsmRepair==row.bsmRepair){
+              this.activeIndex=index
+              this.unitClick(index)
             }
-        )
+          })
+       }
+      });
+
+
     },
-    handleNodeClick (data, node, elem) {
-      this.$parent.loadComponent(this.currentSelectProps,data);
+    handleNodeClick(data, node, elem) {
+      this.$parent.loadComponent(this.currentSelectProps, data);
       this.$parent.tabset();
     },
     //申请单元点击事件
-    unitClick (index) {
-       this.currentSelectProps=this.supplementarylist[index];
-        // this.$parent.tabset();
-     // console.log("this.currentSelectProps", this.supplementarylist[index]);
-      // this.currentSelectProps.batchOperation = false;
-      // this.activeIndex = index.toString();
-      // //选中表单传递数据
-      this.$emit('getCurrentSelectProps', this.currentSelectProps);
-      // this.$parent.stepForm(index);
-      // this.$store.dispatch('user/refreshPage', false);
+    unitClick(index) {
+      this.currentSelectProps = this.supplementarylist[index];
+      this.$emit("getCurrentSelectProps", this.currentSelectProps);
     },
     //登记簿点击事件
-    djbClick () {
-      this.loadBdcdylist ()
-      // console.log("this.currentSelectProps",this.currentSelectProps);
-      this.currentSelectProps.batchOperation = true;
-       this.$parent.getdjblist()
+    djbClick() {
+      this.loadBdcdylist();
 
+      //  this.$parent.getdjblist()
     },
+    // 定位到该条补录记录
+    // orientation(){
+    //   // this.activeIndex="2"
+    //   this.unitClick(0)
+    // },
     // 删除补录记录
-    handleDel(row){
-  console.log("是",row);
+    handleDel(row) {
+      this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
           deleteRepairRecord(row.bsmRepair).then((res) => {
-          if (res.code === 200) {
-         alert("删除成功")
-          }
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+            this.$nextTick(() => {
+              this.getleftMenubl();
+            });
+          });
         })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
     },
-      //补录信息点击事件
-    blxxClick () {
-    this.$parent.tabset()
-
+    //补录信息点击事件默认展示第一条补录记录
+    blxxClick() {
+      this.unitClick(0);
     },
-  }
-  }
+  },
+};
 </script>
-<style scoped lang='scss'>
-  @import "~@/styles/mixin.scss";
-  @import "../../workFrame.scss";
-  .leftmenu ul {
+<style scoped lang="scss">
+@import "~@/styles/mixin.scss";
+@import "../../workFrame.scss";
+.leftmenu ul {
   height: calc(100vh - 120px);
-  }
-  /deep/.rollTable {
+}
+/deep/.rollTable {
   height: calc(100vh - 240px) !important;
 }
 
@@ -204,7 +243,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
   height: 45px;
 }
 
-/deep/ .el-tree-node:focus>.el-tree-node__content {
+/deep/ .el-tree-node:focus > .el-tree-node__content {
   background-color: #f5f5f5;
   color: #0079fe;
   border-right: 4px solid #0079fe;
@@ -214,15 +253,15 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
   white-space: pre-wrap;
 }
 
-/deep/ .is-current>.el-tree-node__content {
+/deep/ .is-current > .el-tree-node__content {
   background-color: #f5f5f5;
   color: #0079fe;
   border-right: 4px solid #0079fe;
 }
-.menus{
+.menus {
   background-color: #e7f4fe;
 }
-.blxx{
-  border:#b0d9f8 solid 1px;
+.blxx {
+  border: #b0d9f8 solid 1px;
 }
 </style>

 <!--
  * @Description  : 房地产权2
  * @Autor        : miaofang
- * @LastEditTime : 2023-06-13 14:33:55
+ * @LastEditTime : 2023-06-14 10:52:48
 -->
 <template>
   <div class="djxxTable">
@@ -106,21 +106,39 @@ export default {
       return name;
     },
         editDialog(row){
-        this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
-        datalist:this.columns,
-        data: row,
+            this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$parent.addRepairRecord(row)
+
+          this.$message({
+            type: 'success',
+            message: '补录成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消编辑'
+          });
+        });
+
+      //   this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
+      //   datalist:this.columns,
+      //   data: row,
+
+      // })
 
-      })
       },
       // 删除
+      // 删除
       deleteDialog(row){
-            let that = this
-        this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(async () => {
-
+        }).then(() => {
            // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
           // deleteClmx(bsmClmx).then(res => {
           //   if (res.code == 200) {
@@ -131,18 +149,19 @@ export default {
           //     })
           //   }
           // })
-           that.$message({
-                message: '删除成功!',
-                type: 'success'
-              })
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
         }).catch(() => {
           this.$message({
             type: 'info',
             message: '已取消删除'
-          })
-        })
+          });
+        });
 
       }
+
   },
 };
 </script>

@@ -49,7 +49,6 @@ export default {
         if (res.code === 200) {
             this.leftButtonList = res.result.button;
             this.rightButtonList = res.result.operation;
-            console.log("this.leftButtonList",this.leftButtonList);
           // this.rightButtonList.splice(0,2)
         }
       })
@@ -57,7 +56,6 @@ export default {
     },
     //流程环节操作按钮
     operation (item) {
-      console.log("流程环节操作按钮信息",item);
       //按钮 B0:选择不动产单元 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书 B7:证书领取 B8:楼盘表 B9:登簿
       //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       let that = this;
@@ -107,7 +105,23 @@ export default {
           //   bsmSlsq: this.bsmSlsq,
           //   entryType: '1'
           // }, '65%', true)
+          this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             this.addRepairRecord()
+            this.$message({
+              type: 'success',
+              message: '补录成功!'
+            });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '取消编辑'
+            });
+          });
+
           break;
         case "B6":
           //根据编号获取对应信息

@@ -37,7 +37,7 @@
     <!-- 内容框架 -->
     <div class="containerFrame">
       <!-- 左侧菜单栏 区分业务-->
-      <ordinaryMenu @getCurrentSelectProps="getCurrentSelectProps" />
+      <ordinaryMenu ref="Menu" @getCurrentSelectProps="getCurrentSelectProps" />
       <div class="leftCon">
         <!-- 分屏左侧预览 -->
         <div v-if="splitScreen" class="splitScreen-con">
@@ -154,56 +154,28 @@ export default {
        arr[index].value=item.id
      })
      this.tabList=this.tabdata
-     //console.log("登记簿列表",this.tabList);
    }, 200)
 
     },
-  //   // 获取渲染补录信息列表
-  //       getdjblist(){
-  //     console.log("执行1",this.currentSelectProps);
-  //    getBdcqljqtsx({
-  //       bdcdyid: this.currentSelectProps.bdcdyid,
-  //       bdcdyh: this.currentSelectProps.bdcdyh,
-  //     }).then((res) => {
-  //       if (res.code === 200) {
-  //         this.treedata = loadTreeData(res.result, this.bdcdyh);
-  //         this.$nextTick(function () {
-  //           this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
-  //            this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
-  //         });
-  //       }
-  //     });
-
-  //  setTimeout(() => {
-  //    let settree=JSON.parse(JSON.stringify(this.treedata))
-  //    this.tabdata=[...settree,...settree[1].children[0].children[0].children]
-  //    this.tabdata.forEach((item,index,arr) => {
-  //      arr[index].name=item.label;
-  //      arr[index].value=item.id
-  //    })
-  //    this.tabList=this.tabdata
-  //    //console.log("登记簿列表",this.tabList);
-  //  }, 200)
-
-  //   },
 
     // 增加补录记录
-      addRepairRecord(){
-         addRepairRecord({
-           bsmQlxx:"a8a979f688fc9afc6ca7f0c124f64ede",
+      addRepairRecord(row){
+         let from={
+           bsmQlxx:"",
            bsmSlsq:this.bsmSlsq,
            bsmSldy:this.currentSelectProps.bsmSldy,
            operate:"C",
            qllx:this.currentSelectProps.qllx
-        }).then((res) => {
-        console.log("添加补录记录",res);
-        if (res.code === 200) {
-          this.treedata = loadTreeData(res.result, this.bdcdyh);
-          this.$nextTick(function () {
-            this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
-             this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
-          });
         }
+        if(row){
+          from.bsmQlxx=row.bsmQlxx
+          from.operate="U"
+        }
+
+         addRepairRecord(from).then((res) => {
+        this.$nextTick(() => {
+              this.$refs.Menu.getleftMenubl(res.result);
+            });
       });
       },
     tabset(){

@@ -68,6 +68,10 @@ class data extends filter {
         minWidth: '150'
       },
       {
+        prop: "gyqk",
+        label: "共有方式",
+      },
+      {
         prop: "qlrmc",
         label: "使用权人",
       },
@@ -81,7 +85,7 @@ class data extends filter {
         label: "权利性质",
       },
       {
-        prop: "mj",
+        prop: "mjmc",
         width: '100',
         label: "使用权面积",
       },     
@@ -90,6 +94,11 @@ class data extends filter {
         label: "土地用途",
       }, 
       {
+        prop: "qdjgmc",
+        width: '100',
+        label: "取得价格",
+      },
+      {
         prop: "zl",
         label: "坐落",
         minWidth: '150'