Merge branch 'dev'

@@ -10,7 +10,7 @@
 
 <template>
   <div :class="['lb-table', customClass]">
-    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '45px' }" ref="elTable" :border='border'
+    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: rowStyleHeight+'px' }" ref="elTable" :border='border'
       :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -24,7 +24,7 @@
       </lb-column>
     </el-table>
 
-    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '45px' }"
+    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: rowStyleHeight+'px'  }"
       :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">
@@ -65,6 +65,10 @@
         type: Boolean,
         default: true,
       },
+      rowStyleHeight: {
+        type: Number,
+        default: 45,
+      },
       showHeader: {
         type: Boolean,
         default: true,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-15 09:35:06
+ * @LastEditTime: 2024-01-18 14:55:20
 -->
 <template>
   <div>
-    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0"
+    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0" :rowStyleHeight='25'
       :data="tableDataList">
     </lb-table>
     <addQlr v-model="dialog" :details="details" :showButton="disabled" @updateDetail="handleupdateDetail" />
@@ -126,6 +126,7 @@
             if (val.length == 0 || !val) {
             } else {
               that.tableDataList = _.cloneDeep(val)
+              that.key++
             }
           })
         },
@@ -138,6 +139,7 @@
           if (newVal == 0) {
             this.column = _.cloneDeep(dataList)
             this.tableDataList = _.cloneDeep(this.tableData)
+            this.key++
           } else if ((newVal == '1' || newVal == '3')) {
             this.column = dataList
           } else {
@@ -329,6 +331,9 @@
   }
 </script>
 <style scoped lang="scss">
+  /deep/.el-table--small .el-table__cell {
+    padding: 0 0 !important;
+  }
   /deep/.el-table th {
     height: 30px !important;
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 14:21:08
+ * @LastEditTime: 2024-01-18 14:51:42
 -->
 <template>
   <div>
-    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0"
+    <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="0" :rowStyleHeight='25'
       :data="tableDataList">
     </lb-table>
     <addQlr v-model="dialog" :details="details" :showButton="disabled" @updateDetail="handleupdateDetail" />
@@ -301,10 +301,16 @@
   }
 </script>
 <style scoped lang="scss">
+  /deep/.el-table--small .el-table__cell {
+    padding: 0 0 !important;
+  }
   /deep/.el-table th {
     height: 30px !important;
   }
   /deep/.el-table .cell {
     padding-right: 12px;
   }
+  /deep/.el-table__body-wrapper {
+    height: auto !important;
+  }
 </style>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 10:45:25
+ * @LastEditTime: 2024-01-18 15:02:23
 -->
 <template>
   <div class="container">

@@ -31,6 +31,12 @@ class data extends filter {
         label: "流程状态",
         width: '80',
         render: (h, scope) => {
+          if (scope.row.ajzt == '4') {
+            return <div class='prohibit'>不予登记</div>
+          }
+          if (scope.row.ajzt == '5') {
+            return <div class='prohibit'>用户撤回</div>
+          }
           if (scope.row.cfgqzt == '1') {
             return <div class='suspend'>查封挂起</div>
           }