Merge branch 'dev'

@@ -117,7 +117,6 @@
        * @author: renchao
        */
       loadBdcdylist () {
-        console.log("获取currentSelectProps表单并加载");
         var formdata = new FormData();
         if (this.bsmSlsq) {
           formdata.append("bsmSlsq", this.bsmSlsq);
@@ -139,7 +138,6 @@
        * @author: renchao
        */
       getleftMenubl (row) {
-        console.log("获取右侧菜单传参",row);
 
         leftMenubl(this.bsmSlsq).then((res) => {
           this.supplementarylist = res.result;
@@ -156,7 +154,6 @@
             this.unitClick(0)
              this.activeIndex = "0"
           } else {
-             console.log("左侧列表为空");
             this.loadBdcdylist()
             // this.$emit("getCurrentSelectProps", this.currentSelectProps);
           }
@@ -186,7 +183,6 @@
        * @author: renchao
        */
       unitClick (index) {
-        console.log("index数据的下标",index);
         this.currentSelectProps = this.supplementarylist[index];
         this.$emit("getCurrentSelectProps", this.currentSelectProps);
       },

@@ -41,7 +41,7 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          查封不动产情况
+          查封登记不动产情况
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">

@@ -46,7 +46,7 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item
-              label="抵押不动产信息："
+              label="地役权不动产信息："
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules"
             >

@@ -554,7 +554,6 @@
        * @author: renchao
        */
       djlxchange (val) {
-        console.log("val", val);
         if (val == null || val == 100) {
           this.ssqlxxshow = false;
         } else {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 10:18:10
+ * @LastEditTime: 2023-07-31 14:30:56
 -->
 <template>
   <!-- 受理信息 -->
@@ -41,7 +41,7 @@
           建设用地、宅基地使用权信息
           <div class="triangle"></div>
         </div>
-        <el-row :gutter="10">
+        <el-row :gutter="24">
           <el-col :span="8" v-if="ssqlxxshow">
             <el-form-item label="上手权利信息：">
               <select-table
@@ -65,6 +65,8 @@
               </select-table>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="不动产单元号：">
               <el-input disabled v-model="ruleForm.qlxx.bdcdyh"></el-input>
@@ -377,8 +379,17 @@
         },
       };
     },
-    created () {
-      this.loadData();
+    /**
+     * @description: djlxchange
+     * @param {*} val
+     * @author: renchao
+     */
+    djlxchange (val) {
+      if (val == null || val == 100) {
+        this.ssqlxxshow = false;
+      } else {
+        this.ssqlxxshow = true;
+      }
     },
     mounted () {
       this.ableOperation = this.$parent.ableOperation

@@ -42,12 +42,12 @@
           </el-col>
         </el-row>
           <div class="slxx_title title-block">
-          抵押不动产情况
+         预告抵押登记信息不动产情况
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="8">
-            <el-form-item label="抵押不动产信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules">
+          <el-col :span="8" v-if="ztQlxxList">
+            <el-form-item label="抵押不动产信息：" prop="ztQlxx" :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
                 :table-width="550"
@@ -588,7 +588,6 @@ export default {
      * @author: renchao
      */
        djlxchange(val) {
-      console.log("val",val);
       if (val == null || val == 100) {
         this.ssqlxxshow = false;
       } else {

@@ -42,7 +42,7 @@
           </el-col>
         </el-row>
         <div class="slxx_title title-block">
-          预告登记信息
+         预告买卖登记信息不动产情况
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
@@ -495,7 +495,6 @@ export default {
      * @author: renchao
      */
        djlxchange(val) {
-      console.log("val",val);
       if (val == null || val == 100) {
         this.ssqlxxshow = false;
       } else {

@@ -47,7 +47,10 @@
             当前流程所在环节:
             <span>{{ this.zbhj }}</span>
           </div>
-          <el-tabs v-model="tabName" :before-leave="beforeLeave">
+          <el-tabs
+            v-model="tabName"
+            :before-leave="beforeLeave"
+            @tab-click="handleClick">
             <el-tab-pane
               :label="item.name"
               :name="item.value"

@@ -12,7 +12,8 @@
         <li
           @click="operation(item)"
           v-for="(item, index) in leftButtonList"
-          :key="index">
+          :key="index"
+        >
           <svg-icon class="icon" :icon-class="item.icon" />
           <span class="iconName">{{ item.name }}</span>
         </li>
@@ -21,7 +22,8 @@
         <li
           @click="operation(item)"
           v-for="(item, index) in rightButtonList"
-          :key="index">
+          :key="index"
+        >
           <svg-icon class="icon" :icon-class="item.icon" />
           <span class="iconName">{{ item.name }}</span>
         </li>
@@ -43,18 +45,24 @@
         </div>
         <!-- 表单内容区域 -->
         <div class="rightContainer">
-          <el-tabs v-model="tabName" :before-leave="beforeLeave">
+          <el-tabs
+            v-model="tabName"
+            :before-leave="beforeLeave"
+            @tab-click="handleClick"
+          >
             <el-tab-pane
               :label="item.name"
               :name="item.value"
               v-for="item in tabList"
-              :key="item.value">
+              :key="item.value"
+            >
             </el-tab-pane>
           </el-tabs>
           <component
             :key="fresh"
             :is="componentTag"
-            v-bind="currentSelectProps" />
+            v-bind="currentSelectProps"
+          />
         </div>
       </div>
     </div>
@@ -63,26 +71,26 @@
   </div>
 </template>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "./workFrame.scss";
+@import "~@/styles/mixin.scss";
+@import "./workFrame.scss";
 </style>
 <script>
-  import WorkFlow from "./mixin/index";
-  import { getForm } from "./flowform";
-  import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
-  import NoticeBar from "@/components/NoticeBar/index";
-  // import ProcessViewer from "./components/processViewer.vue";
-  // 引入左侧菜单
-  import { leftMenubl } from "@/api/djbRepair.js";
-  import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
-  import qllxDailog from "./djbBook/components/qllxDailog";
-  import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
-  import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
-  // 登记簿数据信息
-  import { addRepairRecord } from "@/api/djbRepair.js";
+import WorkFlow from "./mixin/index";
+import { getForm } from "./flowform";
+import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
+import NoticeBar from "@/components/NoticeBar/index";
+// import ProcessViewer from "./components/processViewer.vue";
+// 引入左侧菜单
+import { leftMenubl } from "@/api/djbRepair.js";
+import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
+import qllxDailog from "./djbBook/components/qllxDailog";
+import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
+import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
+// 登记簿数据信息
+import { addRepairRecord } from "@/api/djbRepair.js";
 
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
-  export default {
+import { getBdcqljqtsx } from "@/api/djbDetail.js";
+export default {
   components: {
     selectBdc,
     NoticeBar,
@@ -90,7 +98,7 @@
     qllxDailog,
   },
   mixins: [WorkFlow],
-    data () {
+  data() {
     return {
       bsmSlsq: this.$route.query.bsmSlsq,
       bestepid: this.$route.query.bestepid,
@@ -117,10 +125,10 @@
       bsmRepair: "",
       tabdata: [],
       defaultNode: {},
-        ableOperation: false
+      ableOperation: false,
     };
   },
-    mounted () {
+  mounted() {
     // this.getleftMenubl()
   },
 
@@ -130,16 +138,15 @@
      * @param {*} qllx
      * @author: renchao
      */
-      stepForm (qllx) {
+    stepForm(qllx) {
       this.oneSelectProps.qllx = qllx;
       if (this.$refs.Menu.supplementarylist.length) {
-          this.oneSelectProps.type = this.type
+        this.oneSelectProps.type = this.type;
         getBlYbxStepFormInfo(this.oneSelectProps).then((res) => {
           this.$nextTick(function () {
             this.tabList = res.result;
             this.tabName = this.tabList[0].value;
-              console.log("是否只读", this.tabList[0].ableOperation);
-              this.ableOperation = this.tabList[0].ableOperation
+            this.ableOperation = this.tabList[0].ableOperation;
             this.getFromRouter(this.tabName);
           });
         });
@@ -151,8 +158,8 @@
      * @param {*} val
      * @author: renchao
      */
-      getCurrentSelectProps (val) {
-        this.bsmRepair = val.bsmRepair
+    getCurrentSelectProps(val) {
+      this.bsmRepair = val.bsmRepair;
       if (val.bdcdyid) {
         this.oneSelectProps = val;
       }
@@ -172,7 +179,7 @@
      * @description: 获取渲染登记簿列表
      * @author: renchao
      */
-      getdjblist () {
+    getdjblist() {
       getBdcqljqtsx({
         bdcdyid: this.currentSelectProps.bdcdyid,
         bdcdyh: this.currentSelectProps.bdcdyh,
@@ -200,13 +207,27 @@
         }
       });
     },
+    //选项卡切换事件
+    /**
+     * @description: 右侧表单选项卡事件
+     * @param {*} handleClick
+     * @author: renchao
+     */
+    handleClick(a) {
+      let p = Object.keys(this.tabList[0]).filter(
+        (item) => item == "ableOperation"
+      );
+      if (p) {
+        this.ableOperation = this.tabList[a.index].ableOperation;
+      }
+    },
     //右侧表单选项卡事件
     /**
      * @description: 右侧表单选项卡事件
      * @param {*} activeName
      * @author: renchao
      */
-      beforeLeave (activeName) {
+    beforeLeave(activeName) {
       if (activeName && activeName != 0) this.getFromRouter(activeName);
     },
     //切换选项卡内容组件
@@ -215,14 +236,14 @@
      * @param {*} tabname
      * @author: renchao
      */
-      getFromRouter (tabname) {
+    getFromRouter(tabname) {
       this.componentTag = getForm(tabname);
     },
     /**
      * @description: closefp
      * @author: renchao
      */
-      closefp () {
+    closefp() {
       this.splitScreen = this.splitScreen ? false : true;
       this.$store.dispatch("app/set1tScreen", this.splitScreen);
       this.getFromRouter(this.tabList[0].value);
@@ -235,7 +256,7 @@
      * @param {*} del
      * @author: renchao
      */
-      addRepairRecord (row, del) {
+    addRepairRecord(row, del) {
       let from = {
         bsmQlxx: "",
         bsmSlsq: this.bsmSlsq,
@@ -275,6 +296,6 @@
         });
     },
   },
-  };
+};
 </script>
 <style scoped lang="scss"></style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-28 11:37:31
+ * @LastEditTime: 2023-07-31 13:59:45
 -->
 <template>
   <div class="clxx">
@@ -253,7 +253,8 @@
       //查看明细
       viewDetail () {
         this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", {
-          data: this.tableData
+          data: this.tableData,
+          unitData: this.$parent.unitData
         }, "60%")
       },
       //设置tableData

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-28 09:35:42
+ * @LastEditTime: 2023-07-31 14:27:07
 -->
 <template>
   <div class="clmlmx-box">
     <div class="title">申请材料目录</div>
-    <lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
+    <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
     </lb-table>
     <div class="text-center">
       <el-button @click="$popupCacel">取消</el-button>
@@ -14,6 +14,7 @@
   </div>
 </template>
 <script>
+  import Vue from 'vue'
   import store from '@/store/index.js'
   import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
   export default {
@@ -38,21 +39,21 @@
             label: "是否必选",
             width: "80",
             render: (h, scope) => {
-              if (scope.row.sfxjcl === "1") {
+              if (scope.row.isrequired === "1") {
                 return (
                   <div>
-                    <span>可选</span>
+                    <span>必选</span>
                   </div>
                 );
               }
               else {
                 return (
                   <div>
-                    <span>必选</span>
+                    <span>可选</span>
                   </div>
-                );
+                )
+              }
             }
-            },
           },
           {
             prop: "sjmc",
@@ -67,13 +68,23 @@
                 <div>
                   <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
                 </div>
-              );
-            },
+              )
+            }
           },
           {
             prop: "sjsl",
             label: "份数",
-            width: "50"
+            width: "50",
+            render: (h, scope) => {
+              return (
+                <div>
+                  {
+                    scope.row.sjsl ?
+                      <span>{scope.row.sjsl}</span> : 1
+                  }
+                </div>
+              )
+            }
           },
           {
             prop: "smzt",
@@ -147,11 +158,16 @@
         tableData: []
       }
     },
-    created () {
-      console.log(this.formData.data, 'formData');
+    watch: {
+      'formData.data': {
+        handler: function (val, oldVal) {
+          this.tableData = val
+        },
+        immediate: true,
+        deep: true
+      }
     },
     methods: {
-      // 材料目录明细初始化
       /**
        * @description: 材料目录明细初始化
        * @author: renchao
@@ -160,24 +176,24 @@
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
-          formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
-          formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
+          formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
+          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
           formdata.append("clfl", 2);
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
               resolve(res.code)
               if (res.result && res.result.length > 0) {
-                this.data = res.result;
+                this.tableData = res.result;
               } else {
-                this.data = []
+                this.tableData = []
               }
+              console.log(this.tableData, 'this.tableData');
             } else {
               this.$message.error(res.message)
             }
           })
         })
       },
-      // 上移
       /**
        * @description: 上移
        * @param {*} index
@@ -199,14 +215,12 @@
                 message: '上移成功',
                 type: 'success'
               })
-              this.$parent.setTableData(this.data)
             }
           } else {
             this.$message.error(res.message);
           }
         })
       },
-      // 下移
       /**
        * @description: 下移
        * @param {*} index
@@ -256,7 +270,6 @@
                   message: "删除成功",
                   type: "success",
                 })
-                // this.$parent.setTableData(this.data)
               }
             }
           })
@@ -293,7 +306,6 @@
   @import "~@/styles/mixin.scss";
   .clmlmx-box {
     margin: 0 auto;
-
     .title {
       text-align: center;
       height: 60px;

@@ -39,7 +39,7 @@
             当前流程所在环节:
             <span>{{ this.zbhj }}</span>
           </div>
-          <el-tabs v-model="tabName" :before-leave="beforeLeave">
+          <el-tabs v-model="tabName" :before-leave="beforeLeave" @tab-click="handleClick">
             <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
             </el-tab-pane>
           </el-tabs>
@@ -203,7 +203,21 @@
         }
 
         this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
+      },
+         //选项卡切换事件
+    /**
+     * @description: 右侧表单选项卡事件
+     * @param {*} handleClick
+     * @author: renchao
+     */
+    handleClick(a) {
+      let p = Object.keys(this.tabList[0]).filter(
+        (item) => item == "ableOperation"
+      );
+      if (p) {
+        this.ableOperation = this.tabList[a.index].ableOperation;
       }
+    },
     }
   }
 </script>

@@ -36,7 +36,7 @@
         </div>
         <!-- 表单内容区域 -->
         <div class="rightContainer">
-          <el-tabs v-model="tabName" :before-leave="beforeLeave">
+          <el-tabs v-model="tabName" :before-leave="beforeLeave" @tab-click="handleClick">
             <el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
             </el-tab-pane>
           </el-tabs>
@@ -148,6 +148,20 @@
           }
         })
       },
+         //选项卡切换事件
+    /**
+     * @description: 右侧表单选项卡事件
+     * @param {*} handleClick
+     * @author: renchao
+     */
+    handleClick(a) {
+      let p = Object.keys(this.tabList[0]).filter(
+        (item) => item == "ableOperation"
+      );
+      if (p) {
+        this.ableOperation = this.tabList[a.index].ableOperation;
+      }
+    },
     }
   }
 </script>