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()

@@ -8,28 +8,24 @@
     class="from-clues loadingtext"
     v-Loading="loading"
     element-loading-text="拼命加载中..."
-    style="height: 720px; text-align: center"
-  >
+    style="height: 720px; text-align: center">
     <!-- 表单部分 -->
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="证书预览" name="zsyl">
         <el-empty
           description="暂无数据"
-          v-if="headTabBdcqz.length == 0 && noData"
-        ></el-empty>
+          v-if="headTabBdcqz.length == 0 && noData"></el-empty>
         <div class="zsys">
           <canvas
             ref="zs"
             width="1000"
             v-show="this.bdcqz.bdcqzlx == 1"
-            height="700"
-          ></canvas>
+            height="700"></canvas>
           <canvas
             ref="zm"
             width="1180"
             v-show="this.bdcqz.bdcqzlx == 2"
-            height="780"
-          ></canvas>
+            height="780"></canvas>
         </div>
       </el-tab-pane>
       <el-tab-pane label="证书详情" name="lcjl">
@@ -79,17 +75,14 @@
           缮证记录信息
           <div class="triangle"></div>
         </div>
-        <div class="from-clues-content">
         <lb-table
           class="sz"
           :column="szxxtableData.columns"
           heightNumSetting
           :pagination="false"
           :key="key"
-            :data="szxxtableData.data"
-          >
+          :data="szxxtableData.data">
         </lb-table>
-        </div>
         <div class="slxx_title title-block">
           发证记录信息
           <div class="triangle"></div>
@@ -99,8 +92,7 @@
           :column="tableDatas.columns"
           :heightNum="100"
           :data="tableDatas.data"
-          :pagination="false"
-        >
+          :pagination="false">
         </lb-table>
       </el-tab-pane>
       <el-tab-pane label="电子证照" name="third"> 等一个照片 </el-tab-pane>
@@ -109,13 +101,13 @@
 </template>
 
 <script>
-// import { zsyldatas } from "../../javascript/zsyl.js";
-import { getSlsqBdcqzList } from "@/api/bdcqz.js";
-import { getCertificateList } from "@/api/bdcqz.js";
-import { getSzRecordList } from "@/api/bdcqz.js";
-import { szxxdatas } from "../../javascript/szxxdatapart";
-import { datas } from "../../javascript/fzxxdatapart";
-export default {
+  // import { zsyldatas } from "../../javascript/zsyl.js";
+  import { getSlsqBdcqzList } from "@/api/bdcqz.js";
+  import { getCertificateList } from "@/api/bdcqz.js";
+  import { getSzRecordList } from "@/api/bdcqz.js";
+  import { szxxdatas } from "../../javascript/szxxdatapart";
+  import { datas } from "../../javascript/fzxxdatapart";
+  export default {
     name: "zsyl",
     props: {
       formData: {
@@ -123,7 +115,7 @@ export default {
         default: {},
       },
     },
-  data() {
+    data () {
       return {
         key: 0,
         noData: false,
@@ -165,7 +157,7 @@ export default {
         },
       };
     },
-  mounted() {
+    mounted () {
       this.queryClick();
       this.query();
       if (this.formData.bdcqz) {
@@ -181,12 +173,12 @@ export default {
        * @description: queryClick
        * @author: miaofang
        */
-    queryClick() {
+      queryClick () {
         this.formdata.bsmSlsq = this.formData.bsmSlsq;
         getCertificateList(this.formdata).then((res) => {
           if (res.code === 200) {
             this.tableDatas.data = res.result ? res.result : [];
-          console.log("this.tableDatas",this.tableDatas);
+            console.log("this.tableDatas", this.tableDatas);
           }
         });
       },
@@ -194,7 +186,7 @@ export default {
        * @description: query
        * @author: miaofang
        */
-    query() {
+      query () {
         getSzRecordList({ bsmBdcqz: this.formData.bsmBdcqz }).then((res) => {
           if (res.code == 200) {
             this.szxxtableData.data = res.result;
@@ -207,7 +199,7 @@ export default {
        * @param {*} code
        * @author: miaofang
        */
-    getRowValue(code) {
+      getRowValue (code) {
         var value = this.bdcqz[code];
         return value;
       },
@@ -215,7 +207,7 @@ export default {
        * @description: 获取受理申请下全部不动产权证
        * @author: miaofang
        */
-    getHeadTabBdcqz() {
+      getHeadTabBdcqz () {
         console.log("formData", this.formData);
         this.loading = true;
         getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then((res) => {
@@ -240,7 +232,7 @@ export default {
        * @param {*} e
        * @author: miaofang
        */
-    handleClick(tab, event) {
+      handleClick (tab, event) {
         console.log(tab, event);
         this.bdcqz = this.headTabBdcqz[0];
         if (this.bdcqz.bdcqzlx == 1) {
@@ -253,8 +245,8 @@ export default {
        * @description: 不动产证书
        * @author: miaofang
        */
-    drawTextOnImage() {
-      function getByteLen(val) {
+      drawTextOnImage () {
+        function getByteLen (val) {
           var len = 0;
           if (!val) return len;
           for (var i = 0; i < val.length; i++) {
@@ -497,8 +489,8 @@ export default {
        * @description: 不动产证明
        * @author: miaofang
        */
-    drawTextzmImage() {
-      function getByteLen(val) {
+      drawTextzmImage () {
+        function getByteLen (val) {
           var len = 0;
           if (!val) return len;
           for (var i = 0; i < val.length; i++) {
@@ -696,27 +688,27 @@ export default {
       },
     },
     computed: {
-    hdiffHeight() {
+      hdiffHeight () {
         return 0;
         //  return this.headTabBdcqz.length > 1 ? 54 : 0
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
 
-.imgClass {
+  .imgClass {
     display: inline-block;
     height: auto;
     max-width: 100%;
-}
+  }
 
-.middle_padding {
+  .middle_padding {
     padding-bottom: 10px;
-}
+  }
 
-.zsyl-button {
+  .zsyl-button {
     text-align: center;
     margin-top: 20px;
 
@@ -729,9 +721,9 @@ export default {
       color: white;
       background-color: rgb(0, 121, 254);
     }
-}
+  }
 
-.table-column {
+  .table-column {
     border-spacing: 1px;
     width: 100%;
 
@@ -743,37 +735,37 @@ export default {
       font-size: 13px;
       background: rgb(251, 249, 229);
     }
-}
+  }
 
-.zsyl-title {
+  .zsyl-title {
     background: #fafbe5;
     text-align: center;
     padding: 5px 0px;
     font-size: 20px;
-}
+  }
 
-.no-data {
+  .no-data {
     font-size: 18px;
     display: flex;
     text-align: center;
     justify-content: center;
-}
-.el-tab-pane {
+  }
+  .el-tab-pane {
     width: 1190px;
     height: 670px;
     overflow-y: auto;
-}
-.zsys {
+  }
+  .zsys {
     width: 1180px;
     height: 670px;
-}
-/deep/.el-table {
+  }
+  /deep/.el-table {
     height: 100px !important;
-}
-/deep/.sz {
-  height: 340px !important;
-}
-.el-form{
+  }
+  // /deep/.sz {
+  //   height: 340px !important;
+  // }
+  .el-form {
     margin-top: 20px;
-}
+  }
 </style>

@@ -26,26 +26,23 @@
         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 {
+  import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
+  import { popupCacel } from "@/utils/popup.js";
+  import { mapGetters } from 'vuex'
+  export default {
     components: {},
 
     props: {
@@ -57,8 +54,9 @@ export default {
     computed: {
       ...mapGetters(['yjsqOptions'])
     },
-  data() {
+    data () {
       return {
+        loading: false,
         queryForm: {},
         shyj: "",
       };
@@ -74,7 +72,7 @@ export default {
       //   },
       // },
     },
-  mounted() {
+    mounted () {
       //  this.queryForm= this.queryForm.obj
     },
     methods: {
@@ -82,7 +80,7 @@ export default {
        * @description: submitForm
        * @author: renchao
        */
-      commonOpinion() {
+      commonOpinion () {
         this.$popupDialog(
           "常用意见",
           "workflow/components/dialog/commonOpinion",
@@ -91,21 +89,17 @@ export default {
           true
         );
       },
-    submitForm() {
+      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("转件成功");
-          // setTimeout(() => {
-          //   window.opener = null;
-          //   window.open("about:blank", "_self");
-          //   window.close();
-          //   this.$emit("input", false);
-          // }, 1000);
             popupCacel();
             setTimeout(() => {
               // window.opener.location.reload(); //刷新父窗口
@@ -120,36 +114,36 @@ export default {
           } else {
             this.$message.error(res.message);
           }
-      });
+        }).catch(() => {
+          this.loading = false
+        })
       },
 
       /**
        * @description: closeDialog
        * @author: renchao
        */
-    cancelBack() {
+      cancelBack () {
         popupCacel();
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-.el-button {
+  @import "~@/styles/mixin.scss";
+  .el-button {
     margin-top: 20px;
     margin-right: 10px;
-}
+  }
 
-.opinion {
+  .opinion {
     position: relative;
     font-size: 14px;
+  }
 
-
-}
-
-.opinion_btn {
+  .opinion_btn {
     position: absolute;
-right: 35px;
+    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 {
+  export default {
     name: "BdcdjWebYcsl",
 
-  data() {
+    data () {
       return {};
     },
 
-  mounted() {},
+    mounted () { },
 
     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 {
+  export default {
     name: "BdcdjWebYcsl",
 
-  data() {
+    data () {
       return {};
     },
 
-  mounted() {},
+    mounted () { },
 
     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

@@ -66,10 +66,10 @@
 </template>
 
 <script>
-import store from '@/store/index.js'
-import { zsrk, getZsglInfo } from "@/api/zsgl.js"
-import { getSysSerialSingle } from "@/api/sysSerial.js"
-export default {
+  import store from '@/store/index.js'
+  import { zsrk, getZsglInfo } from "@/api/zsgl.js"
+  import { getSysSerialSingle } from "@/api/sysSerial.js"
+  export default {
     props: {
       formData: {
         type: Object,
@@ -141,7 +141,6 @@ export default {
       }
     },
     methods: {
-    //表单提交
       /**
        * @description: 表单提交
        * @author: renchao
@@ -187,6 +186,7 @@ export default {
         getZsglInfo({ "bsmBatch": bsmBatch }).then(res => {
           if (res.code == 200) {
             this.ruleForm = res.result;
+            this.$refs.ruleForm.resetFields()
             this.readOnly = false;
             this.tableForm[0].ksysxlh = res.result.zsstarno;
             this.tableForm[0].jsysxlh = res.result.zsendno;
@@ -272,17 +272,17 @@ export default {
         this.resetTableFields();
       }
     }
-}
+  }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "~@/styles/dialogBoxheader.scss";
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/dialogBoxheader.scss";
 
-.font-red {
-  color: red
-}
+  .font-red {
+    color: red;
+  }
 
-.middle-margin-bottom {
-  margin-top: 20px
-}
+  .middle-margin-bottom {
+    margin-top: 20px;
+  }
 </style>