Merge branch 'dev'

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 09:00:12
+ * @LastEditTime: 2023-10-18 14:06:31
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
     <div v-if="this.isShowdrawer">
       <el-menu
         @select="djbClick"
+        :default-active="activeIndex"
         class="title-batch">
         <el-menu-item index="-1" key="-1" class="menus">
           <div>登记簿</div>
@@ -205,6 +206,7 @@
        * @author: renchao
        */
       handleDel (row) {
+        let that = this
         this.$confirm("此操作将永久删除该条补录记录, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -217,6 +219,10 @@
                 message: "删除成功!",
               });
               this.$nextTick(() => {
+                if (that.activeIndex != '-1') {
+                  this.activeIndex = "0"
+                  sessionStorage.setItem('keyPath', '0');
+                }
                 this.getleftMenubl();
                 if (!this.supplementarylist.length) {
                   getdjblist()

@@ -26,45 +26,43 @@
         v-model="shyj"
         placeholder="请输入审批意见"
         type="textarea"
-        :rows="4"
-      ></el-input>
+        :rows="4"></el-input>
       <!-- <el-button
         class="opinion_btn"
         @click="commonOpinion"
         >常用意见</el-button
       > -->
       <el-button style="float: right" @click="cancelBack">取消转出</el-button>
-      <el-button type="primary" @click="submitForm" style="float: right"
-        >确定转出</el-button
-      >
+      <el-button type="primary" @click="submitForm" :loading="loading" style="float: right">确定转出</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
-import { popupCacel } from "@/utils/popup.js";
-import { mapGetters } from 'vuex'
-export default {
-  components: {},
+  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
+  import { popupCacel } from "@/utils/popup.js";
+  import { mapGetters } from 'vuex'
+  export default {
+    components: {},
 
-  props: {
-    formData: {
-      type: Object,
-      default: {},
+    props: {
+      formData: {
+        type: Object,
+        default: {},
+      },
     },
-  },
     computed: {
       ...mapGetters(['yjsqOptions'])
     },
-  data() {
-    return {
-      queryForm: {},
-      shyj: "",
-    };
-  },
+    data () {
+      return {
+        loading: false,
+        queryForm: {},
+        shyj: "",
+      };
+    },
 
-   watch: {
+    watch: {
       // yjsqOptions: {
       //   handler (val) {
       //      if(val){
@@ -74,82 +72,78 @@ export default {
       //   },
       // },
     },
-  mounted() {
-    //  this.queryForm= this.queryForm.obj
-  },
-  methods: {
-    /**
-     * @description: submitForm
-     * @author: renchao
-     */
-      commonOpinion() {
-      this.$popupDialog(
-        "常用意见",
-        "workflow/components/dialog/commonOpinion",
-        {},
-        "70%",
-        true
-      );
-    },
-    submitForm() {
-      this.queryForm = {
-        bsmSlsq: this.formData.bsmSlsq,
-        shyj: this.shyj,
-        stepform: JSON.stringify(this.formData.tabList),
-      };
-      completeTask(this.queryForm).then((res) => {
-        if (res.code === 200) {
-          this.$message.success("转件成功");
-          // setTimeout(() => {
-          //   window.opener = null;
-          //   window.open("about:blank", "_self");
-          //   window.close();
-          //   this.$emit("input", false);
-          // }, 1000);
-          popupCacel();
-          setTimeout(() => {
-            // window.opener.location.reload(); //刷新父窗口
-            if (window.opener && window.opener.getBpageList) {
-              window.opener.getBpageList();
-            } else {
-              window.opener.frames[0].getBpageList();
-            }
-            window.close();
-            this.$emit("input", false);
-          }, 1000);
-        } else {
-          this.$message.error(res.message);
-        }
-      });
+    mounted () {
+      //  this.queryForm= this.queryForm.obj
     },
+    methods: {
+      /**
+       * @description: submitForm
+       * @author: renchao
+       */
+      commonOpinion () {
+        this.$popupDialog(
+          "常用意见",
+          "workflow/components/dialog/commonOpinion",
+          {},
+          "70%",
+          true
+        );
+      },
+      submitForm () {
+        this.loading = true
+        this.queryForm = {
+          bsmSlsq: this.formData.bsmSlsq,
+          shyj: this.shyj,
+          stepform: JSON.stringify(this.formData.tabList),
+        };
+        completeTask(this.queryForm).then((res) => {
+          this.loading = false
+          if (res.code === 200) {
+            this.$message.success("转件成功");
+            popupCacel();
+            setTimeout(() => {
+              // window.opener.location.reload(); //刷新父窗口
+              if (window.opener && window.opener.getBpageList) {
+                window.opener.getBpageList();
+              } else {
+                window.opener.frames[0].getBpageList();
+              }
+              window.close();
+              this.$emit("input", false);
+            }, 1000);
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
 
-    /**
-     * @description: closeDialog
-     * @author: renchao
-     */
-    cancelBack() {
-      popupCacel();
+      /**
+       * @description: closeDialog
+       * @author: renchao
+       */
+      cancelBack () {
+        popupCacel();
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-.el-button {
-  margin-top: 20px;
-  margin-right: 10px;
-}
-
-.opinion {
-  position: relative;
-  font-size: 14px;
-
+  @import "~@/styles/mixin.scss";
+  .el-button {
+    margin-top: 20px;
+    margin-right: 10px;
+  }
 
-}
+  .opinion {
+    position: relative;
+    font-size: 14px;
+  }
 
-.opinion_btn {
-  position: absolute;
-right: 35px;
+  .opinion_btn {
+    position: absolute;
+    right: 35px;
     bottom: 80px;
-}
+  }
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 13:24:57
+ * @LastEditTime: 2023-10-18 15:46:39
 -->
 <template>
   <div class="container">
@@ -110,7 +110,6 @@
   import { getStepFormInfo, unClaimTask, getZdInfo } from "@/api/workFlow.js";
   import { getForm } from "./flowform";
   import NoticeBar from "@/components/NoticeBar/index";
-  // import ProcessViewer from "./components/processViewer.vue"
   // 引入左侧菜单
   import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
   // 引入左侧菜单

 <!--
  * @Author: yangwei
  * @Date: 2023-09-06 09:20:11
- * @LastEditors: yangwei
- * @LastEditTime: 2023-09-06 09:20:44
- * @FilePath: \bdcdj-web\src\views\ywbl\ycsl\ycsl.vue
- * @Description: 
- * 
- * Copyright (c) 2023 by yangwei, All Rights Reserved. 
+ * @LastEditors: Please set LastEditors
 -->
 <template>
-  <div></div>
+  <div> <el-empty description="正在开发"></el-empty></div>
 </template>
 
 <script>
-export default {
-  name: "BdcdjWebYcsl",
+  export default {
+    name: "BdcdjWebYcsl",
 
-  data() {
-    return {};
-  },
+    data () {
+      return {};
+    },
 
-  mounted() {},
+    mounted () { },
 
-  methods: {},
-};
+    methods: {},
+  };
 </script>
 
 <style lang="scss" scoped></style>

 <!--
  * @Author: yangwei
  * @Date: 2023-09-06 09:19:56
- * @LastEditors: yangwei
- * @LastEditTime: 2023-09-06 09:20:51
- * @FilePath: \bdcdj-web\src\views\ywbl\ydsq\ydsq.vue
- * @Description: 
- * 
- * Copyright (c) 2023 by yangwei, All Rights Reserved. 
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-10-18 13:51:00
 -->
 <template>
-  <div></div>
+  <div>
+    <el-empty description="正在开发"></el-empty>
+  </div>
 </template>
 
 <script>
-export default {
-  name: "BdcdjWebYcsl",
+  export default {
+    name: "BdcdjWebYcsl",
 
-  data() {
-    return {};
-  },
+    data () {
+      return {};
+    },
 
-  mounted() {},
+    mounted () { },
 
-  methods: {},
-};
+    methods: {},
+  };
 </script>
 
 <style lang="scss" scoped></style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:59:44
+ * @LastEditTime: 2023-10-18 15:11:12
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -196,8 +196,16 @@
           this.$refs.table.toggleRowSelection(row);
         }
       },
-    },
-  };
+      handleLpbClick (item) {
+        ywPopupDialog('楼盘表', 'lpb/index', {
+          bsm: item.zrzbsm,
+          bsmSqyw: this.sqywInfo.bsmSqyw,
+          onlyShow: false,
+          scyclx: 1
+        }, '85%', true, false)
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";

@@ -201,7 +201,6 @@
           this.btnDisabled = true;
         }
       },
-      //获取下个节点类型数据
       /**
        * @description: 获取下个节点类型数据
        * @param {*} bsmSqyw
@@ -226,7 +225,6 @@
         })
       },
 
-      //获取下个节点类型数据
       /**
        * @description: 获取下个节点类型数据
        * @author: renchao
@@ -305,7 +303,6 @@
         })
         item.cselect = !item.cselect
       },
-      // 登记类型
       /**
        * @description: 登记类型
        * @param {*} item

@@ -30,6 +30,7 @@ class data extends filter {
       {
         prop: "status",
         label: "状态",
+        width: '120',
         render: (h, scope) => {
           return (
             <div>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 15:28:40
+ * @LastEditTime: 2023-10-18 15:03:39
  */
 import filter from '@/utils/filter.js'
 let vm = null

 <!--
  * @Description: 选择不动产单元号
  * @Autor: renchao
- * @LastEditTime: 2023-05-18 10:59:48[文件：bdcdj-index.html]
+ * @LastEditTime: 2023-10-18 14:03:27
 -->
 <template>
   <component :is="router" :sqywInfo="formData.sqywInfo" :isJump="formData.isJump ? formData.isJump : false"
@@ -23,7 +23,6 @@
       }
     },
     mounted () {
-      console.log(this.formData, 'this.formData');
       if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
         let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
         this.router = this.loadView(view);

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:41:10
+ * @LastEditTime: 2023-10-18 14:49:25
 -->
 <template>
   <div class="from-clues">
@@ -103,12 +103,6 @@
        * @author: renchao
        */
       openDialog (item) {
-        // bdcqzPreview(item).then(res => {
-        //   this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
-        //     bsmSlsq: item.bsmSlsq,
-        //     bsmBdcqz: item.bsmBdcqz
-        //   }, '1230px', true)
-        // })
         this.$popupDialog("证书证明预览", "workflow/components/dialog/zsylxq", {
           bsmSlsq: item.bsmSlsq,
           bsmBdcqz: item.bsmBdcqz