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

@@ -24,7 +24,7 @@
       </lb-column>
     </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"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -47,6 +47,7 @@
 </template>
 
 <script>
+  import { log } from 'bpmn-js-token-simulation'
   import LbColumn from './lb-column'
   export default {
     props: {
@@ -185,9 +186,11 @@
             _this.tableHeight = window.innerHeight - _this.heightNum
           }
         } else {
-          // this.tableHeight = this.heightNum
           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')
+            })
           })
         }
       },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-01 15:24:10
+ * @LastEditTime: 2023-08-02 09:53:05
 -->
 <template>
   <div class="clmlmx-box">
@@ -197,6 +197,8 @@
             this.$popupCacel()
             store.dispatch('user/reWorkFresh', true)
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

@@ -5,7 +5,7 @@
 -->
 <template>
   <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">
     </lb-table>
     <addQlr v-model="dialog" :details="details" :showButton="!isDisabled" @updateDetail="handleupdateDetail" />

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 08:34:59
+ * @LastEditTime: 2023-08-02 09:31:38
 -->
 <template>
   <!-- 受理信息 -->
@@ -116,7 +116,7 @@
               <el-input v-else disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="7">
             <el-form-item label="抵押方式：">
               <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
                 <el-radio label="1">一般抵押权</el-radio>
@@ -124,7 +124,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="9">
             <el-form-item label="是否存在禁止或者限制转让抵押不动产的约定：" label-width="350px">
               <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz" :disabled="!ableOperation|| isJfOperation">
                 <el-radio label="1">启用</el-radio>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:11:52
+ * @LastEditTime: 2023-08-02 09:53:35
 -->
 <template>
   <div class="from-clues">
@@ -155,6 +155,8 @@
             } else {
               ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
+          }).catch(() => {
+            this.loading = false
           })
         } else {
           this.loading = true
@@ -174,7 +176,9 @@
               this.$message.error(res.message);
             }
             this.$popupCacel();
-          });
+          }).catch(() => {
+            this.loading = false
+          })
         }
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:15:01
+ * @LastEditTime: 2023-08-02 09:57:31
 -->
 <template>
   <!-- 抵押权利信息查询 -->
@@ -39,7 +39,7 @@
           <el-col :span="2" class="btnColRight">
             <el-form-item>
               <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-col>
         </el-row>
@@ -139,6 +139,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:16:13
+ * @LastEditTime: 2023-08-02 09:58:05
 -->
 <template>
   <div class="from-clues">
@@ -266,6 +266,8 @@
             } else {
               ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
+          }).catch(() => {
+            this.loading = false
           })
         } else {
           this.loading = true
@@ -285,6 +287,8 @@
             } else {
               ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
             }
+          }).catch(() => {
+            this.loading = false
           })
         }
       },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:16:53
+ * @LastEditTime: 2023-08-02 09:58:24
 -->
 <template>
   <div class="from-clues">
@@ -128,6 +128,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:17:54
+ * @LastEditTime: 2023-08-02 09:56:26
 -->
 <template>
   <div class="from-clues">
@@ -125,6 +125,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:18:37
+ * @LastEditTime: 2023-08-02 09:58:35
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -153,6 +153,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:19:26
+ * @LastEditTime: 2023-08-02 09:58:45
 -->
 <template>
   <div class="from-clues">
@@ -184,6 +184,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:20:26
+ * @LastEditTime: 2023-08-02 09:58:53
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -130,6 +130,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-21 11:18:39
+ * @LastEditTime: 2023-08-02 09:59:05
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -129,6 +129,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:22:11
+ * @LastEditTime: 2023-08-02 09:56:33
 -->
 <template>
   <div class="from-clues">
@@ -138,6 +138,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:34:30
+ * @LastEditTime: 2023-08-02 09:56:41
 -->
 <template>
   <div class="from-clues">
@@ -258,6 +258,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:35:29
+ * @LastEditTime: 2023-08-02 09:59:18
 -->
 <template>
   <div class="from-clues">
@@ -135,6 +135,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:36:26
+ * @LastEditTime: 2023-08-02 09:59:25
 -->
 <template>
   <div class="from-clues">
@@ -138,6 +138,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

@@ -129,6 +129,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:38:00
+ * @LastEditTime: 2023-08-02 09:59:39
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -127,6 +127,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-27 10:04:28
+ * @LastEditTime: 2023-08-02 09:59:44
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -129,6 +129,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

@@ -129,6 +129,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:40:25
+ * @LastEditTime: 2023-08-02 09:59:52
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -130,6 +130,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-31 09:40:53
+ * @LastEditTime: 2023-08-02 09:59:58
 -->
 <template>
   <!-- 主体权利信息查询 -->
@@ -131,6 +131,8 @@
           } else {
             ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
           }
+        }).catch(() => {
+          this.loading = false
         })
       },
       /**