Merge branch 'dev'

@@ -24,7 +24,7 @@
       </lb-column>
       </lb-column>
     </el-table>
     </el-table>
 
 
-    <el-table v-else ref="elTable" id="heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }"
+    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '50px' }"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -47,6 +47,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+  import { log } from 'bpmn-js-token-simulation'
   import LbColumn from './lb-column'
   import LbColumn from './lb-column'
   export default {
   export default {
     props: {
     props: {
@@ -185,9 +186,11 @@
             _this.tableHeight = window.innerHeight - _this.heightNum
             _this.tableHeight = window.innerHeight - _this.heightNum
           }
           }
         } else {
         } else {
-          // this.tableHeight = this.heightNum
           this.$nextTick(() => {
           this.$nextTick(() => {
-            this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px')
+            let arr = document.getElementsByClassName('heightNumSetting');
+            [...arr].forEach(item => {
+              this.minHeight && (item.style.minHeight = this.minHeight + 'px')
+            })
           })
           })
         }
         }
       },
       },

@@ -477,13 +477,29 @@
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
-          ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "blur" }],
+        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "change" }],
          djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
          djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
          ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
          ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
       },
       },
-        ableOperation: false,
+      ableOperation:false,
     };
     };
   },
   },
+  created() {
+    this.loadData();
+  },
+  mounted() {
+      this.ableOperation=this.$parent.ableOperation
+  },
+  methods: {
+    /**
+     * @description: ssQlxxchange
+     * @param {*} val
+     * @author: renchao
+     */
+              ssQlxxchange(val) {
+      this.ruleForm.ssQlxx = val;
+     this.ruleForm.qlxx.ssywh = val.ywh;
+    },
     created () {
     created () {
       this.loadData();
       this.loadData();
     },
     },
@@ -645,7 +661,8 @@
         });
         });
       },
       },
     },
     },
-  };
+  }
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
   @import "~@/styles/public.scss";
   @import "~@/styles/public.scss";

@@ -5,7 +5,7 @@
 -->
 -->
 <template>
 <template>
   <div>
   <div>
-    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
+    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true"
       :data="tableDataList">
       :data="tableDataList">
     </lb-table>
     </lb-table>
     <addQlr v-model="dialog" :details="details" :showButton="!isDisabled" @updateDetail="handleupdateDetail" />
     <addQlr v-model="dialog" :details="details" :showButton="!isDisabled" @updateDetail="handleupdateDetail" />

@@ -22,7 +22,7 @@
                 @change="changeSelectItem(item)"></el-radio>
                 @change="changeSelectItem(item)"></el-radio>
             </p>
             </p>
             <p>{{ item.activityName }}</p>
             <p>{{ item.activityName }}</p>
-            <p v-for="(child, childIndex) in item.userInfos" :key="childIndex">
+            <p v-for="(child, childIndex) in item.assignee" :key="childIndex">
               {{ child.name }}
               {{ child.name }}
             </p>
             </p>
           </li>
           </li>
@@ -113,6 +113,7 @@
         getTaskBackNode(this.formData).then((res) => {
         getTaskBackNode(this.formData).then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
             this.dataList = res.result;
             this.dataList = res.result;
+            console.log("this.dataList",this.dataList);
             if (res.result) {
             if (res.result) {
               this.selectActivity = res.result[0].activityId;
               this.selectActivity = res.result[0].activityId;
               this.selectItem = res.result[0];
               this.selectItem = res.result[0];

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 10:03:31
+ * @LastEditTime: 2023-08-02 09:25:08
 -->
 -->
 <template>
 <template>
   <!-- 抵押权利信息查询 -->
   <!-- 抵押权利信息查询 -->
@@ -39,7 +39,7 @@
           <el-col :span="2" class="btnColRight">
           <el-col :span="2" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleSearch" :loading="loading">查询</el-button>
               <el-button type="primary" @click="handleSearch" :loading="loading">查询</el-button>
-              <el-button type="primary" @click="resetForm(true)">重置</el-button>
+              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>