Merge branch 'proVue' of https://git.steerinfo.com/beiHaiYunWei-lims/beiHai-ui into proVue

cors.js

@@ -205,9 +205,9 @@ module.exports = {
       }
     }
   },
-  // devModules: ['index', 'reportForm','workFlow', 'systemConfig', 'demo', 'taskManagement', 'batchManagement', 'programManagement', 'entrustedManagement', 'screeningTests','sampleManagement', 'sampleManager', 'samplePreparationTask','approveManagement','weightingManagement','testAnalysis','decideManagement','commodityInspection', 'exceptionManagement', 'certificateManagement', 'standardManagement', 'resourceManager']
+  // devModules: ['index', 'entrustedManagement','approveManagement']
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
    devModules: ['all']
   //  devModules:['index']
-  // devModules: ['index',  'entrustedManagement','screeningTests']
+  // devModules: ['index',  'entrustedManagement']
 }

src/views/approveManagement/components/approveOperationLogManagement.vue

@@ -0,0 +1,212 @@
+<!--审核操作日志管理-->
+<template>
+  <div class="systemBase">
+    <div>
+      <div style="margin-top: 10px;  border-bottom: 1px solid #d5d5d5;">
+        <el-form ref="searchData1" :inline="true" :model="search" :rules="ruleValidateSearch">
+          <!-- <el-form-item  label-width="80px" >
+                      <div style="font-size: 16px; padding: 0px 20px;">计量操作日志管理
+                      </div>
+                  </el-form-item> -->
+          <el-form-item prop="operator" label="操作人" >
+            <el-input v-model="search.operator" clearable filterable collapse-tags size="small"
+               style="width:120px;"></el-input>
+          </el-form-item>
+          <el-form-item label="创建日期" prop="times">
+          <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+            <el-button icon="el-icon-search" type="primary" size="mini" @click="searchDatas"  style="margin-right: 10px;"
+               >查询</el-button>
+          <el-button icon="el-icon-refresh" type="info" plain size="mini" :disable="disSearch"
+              @click="reset">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-row>
+        <el-col :span="24">
+          <div class="common-table-div">
+            <el-table v-loading="dataLoading" :row-class-name="tableRowClassName" ref="dataTable" highlight-current-row
+              border :height="tableHeight" @selection-change="handleSelectionChange" :data="table.list"
+              :icore-filter-flag="icoreFilterFlag"
+              :exchangeFilterMap="{ 'meterNoteSource': { '0': '智能计量终端', '1': '自助取码终端', '2': '计量监控终端', '3': '微信小程序', '4': '远程计量终端' } }">
+              <el-table-column type="index" label="序号" fixed="left" align="center"></el-table-column>
+              <!-- <el-table-column type="selection" width="55" align="center"></el-table-column> -->
+              <el-table-column sortable :show-overflow-tooltip="true" prop="operationModule" label="操作模块"
+                min-width="200" align="center"></el-table-column>
+              <el-table-column sortable :show-overflow-tooltip="true" prop="operator" label="操作人" min-width="110"
+                align="left"></el-table-column>
+              <!-- <el-table-column sortable :show-overflow-tooltip="true" prop="operationDescription" label="操作描述"
+                min-width="300" align="left"></el-table-column> -->
+              <el-table-column sortable :show-overflow-tooltip="true" prop="operationTime" label="操作时间" min-width="160"
+                align="center"></el-table-column>
+              <el-table-column sortable :show-overflow-tooltip="true" prop="ipAddress" label="IP地址" min-width="110"
+                align="left"></el-table-column>
+                <el-table-column sortable :show-overflow-tooltip="true" prop="queryParams" label="报文参数" min-width="400"
+                align="left"></el-table-column>
+            </el-table>
+          </div>
+          <div class="common-foot-style">
+            <el-pagination v-loading="dataLoading" @size-change="pageSizeChange" @current-change="pageCurrentChange"
+              :current-page="page.pageNum" :page-sizes="[100, 500, 1000]" :page-size="page.pageSize"
+              layout="total, sizes, prev, pager, next, jumper" :total="page.totalPage">
+            </el-pagination>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+<script>
+import { formatDate } from '@/utils/util.js';
+export default {
+  data() {
+    return {
+      dataLoading: false,
+      operateLoading: false,
+      icoreFilterFlag: true,
+      baseSpotNameItem: [],
+      page: {
+        pageSize: 500,
+        pageNum: 1,
+        totalPage: 0
+      },
+      table: {
+        list: []
+      },
+      multipleSelection: [],
+      tableHeight: 0,
+      search: {
+        operator: '',
+        times: [null, null],
+      },
+      // ruleValidateSearch: {
+      //    envDate: [{ 
+      //      required: true, 
+      //      validator: this.endTimeVerify, 
+      //      trigger: 'blur' 
+      //    }],
+      //    startTime: [{
+      //      required: true, 
+      //      validator: this.strTimeVerify, 
+      //      trigger: 'blur' 
+      //    }]
+      // },
+      activeMenu: ''
+    }
+  },
+  created() {
+    this.tableHeight = (window.innerHeight - 220) > 400 ? window.innerHeight - 220 : 400
+    this.activeMenu = window.top.localStorage.getItem('activeMenu')
+  },
+  mounted() {
+    // this.getDataList();
+    this.searchDatas()
+    this.getBaseSpotNameItem()
+  },
+  methods: {
+    endTimeVerify(rule, value, callback) {
+      //   if (this.search.strDate && !this.search.envDate) {
+      //    callback(new Error('结束时间不能为空！'));
+      //  } else 
+      if (this.search.endTime) {
+        if (Date.parse(this.search.times[1]) > Date.parse(this.search.times[0])) {
+          callback();
+        } else {
+          callback(new Error('结束时间不得早于开始时间！'));
+        }
+      } else {
+        callback();
+      }
+    },
+    strTimeVerify(rule, value, callback) {
+      //  if (this.search.envDate && !this.search.strDate) {
+      //    callback(new Error('开始时间不能为空！'));
+      //  } else {
+      //    callback()
+      //  }
+    },
+    searchDatas() {
+      this.page.pageNum = 1;
+      this.searchData()
+    },
+    searchData() {
+      this.$refs['searchData1'].validate((valid) => {
+        if (valid) {
+          this.dataLoading = true;
+         this.search.times[0] = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+         this.search.times[1] = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+          let obj = {
+            operator: this.search.operator,
+            startTime: this.search.times[0],
+            endTime: this.search.times[1],
+            pageIndex: this.page.pageNum,
+            pageSize: this.page.pageSize
+          }
+          this.axios.post('pass/testManagement/v1/approveoperationlogs/queryLogPage', obj, { individualType: "json" })
+            .then(res => {
+              console.log('logmanagement......', res)
+              this.dataLoading = false;
+              this.table.list = res.data.list;
+              this.page.totalPage = res.data.total;
+            }).catch(e => {
+              this.dataLoading = false;
+            });
+        }
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    getTableHeight(dom) {
+      return (window.innerHeight - dom.offsetTop);
+    },
+    pageSizeChange(size) {
+      this.page.pageSize = size;
+      this.searchData()
+    },
+
+    pageCurrentChange(index) {
+      this.page.pageNum = index;
+      this.searchData()
+    },
+    getDataList() {
+      this.dataLoading = true;
+      let obj ={
+        pageIndex: this.page.pageNum,
+        pageSize: this.page.pageSize,
+      }
+      this.axios.post('pass/testManagement/v1/approveoperationlogs/queryLogPage', obj, { individualType: "json" })
+            .then(res => {
+          this.dataLoading = false;
+          this.table.list = res.data.list;
+          this.page.totalPage = res.data.total;
+        }).catch(e => {
+          this.dataLoading = false;
+        });
+    },
+    tableRowClassName({
+      row,
+      rowIndex
+    }) {
+      if (row.validFlag === '0') {
+        return 'error-row2';
+      }
+      return '';
+    },
+    getBaseSpotNameItem() {
+      this.axios.get('pass/systemBase/v1/meterbasespotinfos/noPage' + '?validFlag=1')
+        .then(res => {
+          this.baseSpotNameItem = res.data;
+        })
+    }
+  }
+}
+</script>
+<style scoped></style>

src/views/approveManagement/components/fourApprove.vue

@@ -1,8 +1,8 @@
-<!-- 四级审核页面 -->
+<!-- 四级审核页面：动态获取表格字段、正则表达式 -->
 <template>
   <div class="examination secondApprove">
     <div class="common-head-search">
-      <el-form :inline="true" :model="search" ref="search" :rules="rules">
+      <el-form :inline="true" :model="search" ref="search">
         <el-form-item label="检验车间" prop="deptNo">
           <el-select v-model="search.deptNo" filterable clearable style="width: 140px" @clear="clearSelect"
             @change="selectClass" size="small">
@@ -57,18 +57,6 @@
           <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
           </el-date-picker>
-          <!-- <el-date-picker
-            v-model="search.times"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            size="small"
-            style="width: 300px"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" :disable="disSearch" @click="searchData"
@@ -583,26 +571,26 @@ export default {
         carNo: "",
         sampleTypeCode: "",
         matName: "",
-        times: "",
+        times: [null, null],
         type: ""
       },
-      rules: {
-        times: [
-          {
-            trigger: ['change', 'blur'],
-            validator: (rule, value, callback) => {
-              const startDate = value[0];
-              const endDate = value[1];
-              if (!startDate || !endDate) {
-                return callback(new Error('请选择完整的日期范围'));
-              }
-              if (new Date(startDate) > new Date(endDate)) {
-                return callback(new Error('开始日期不能晚于结束日期'));
-              }
-              callback();
-            }
-          }],
-      },
+      // rules: {
+      //   times: [
+      //     {
+      //       trigger: ['change', 'blur'],
+      //       validator: (rule, value, callback) => {
+      //         const startDate = value[0];
+      //         const endDate = value[1];
+      //         if (!startDate || !endDate) {
+      //           return callback(new Error('请选择完整的日期范围'));
+      //         }
+      //         if (new Date(startDate) > new Date(endDate)) {
+      //           return callback(new Error('开始日期不能晚于结束日期'));
+      //         }
+      //         callback();
+      //       }
+      //     }],
+      // },
       loading: false,
       dialogTableVisible: false,
       dialogEntrustVisible: false,
@@ -688,8 +676,11 @@ export default {
       this.activeName = this.fromDaiban.status == 1 ? "second" : "first";
     } else {
       this.search.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
+        null, null
+      ];
+      this.search.times = [
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
       ];
     }
 
@@ -860,10 +851,10 @@ export default {
       this.search.sampleNo = "";
       let timestamp = new Date().getTime() - 7 * 24 * 60 * 60 * 1000; // 默认前一周
 
-      this.search.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
-      ];
+      // this.search.times = [
+      //   this.getYNM(new Date(timestamp)) + " 00:00:00",
+      //   this.getYNM(new Date()) + " 23:59:59",
+      // ];
       this.searchData();
     },
     refresh() { },
@@ -1201,35 +1192,38 @@ export default {
         });
     },
     //查询
+    // searchData() {
+    //   if (this.loading) return;
+    //   this.loading = true;
+    //   this.pageIndex = 1;
+    //   this.pageSize = 500;
+    //   this.pageIndex2 = 1;
+    //   this.pageSize2 = 500;
+    //   try {
+    //     this.dataMainWl11().catch(err => console.error('dataMainWl11失败:', err))
+    //       .then(() => this.dataMainWl21().catch(err => console.error('dataMainWl21失败:', err)))
+    //       .finally(() => this.loading = false);
+    //   } catch (error) {
+    //     console.error('数据加载失败:', error);
+    //     this.loading = false;
+    //   }
+    // },
     searchData() {
       if (this.loading) return;
-      console.log("search  time1......", this.search);
-      // this.$refs['search'].validate((valid) => {
-      // this.loading = true;
-      this.$nextTick(() => {
-        this.$refs['search'].validate((valid) => {
-          if (valid) {
-            try {
-              console.log('表单验证通过.......')
-              this.loading = true;
-              this.pageIndex = 1;
-              this.pageSize = 500;
-              this.pageIndex2 = 1;
-              this.pageSize2 = 500;
-              this.dataMainWl11(),
-                this.dataMainWl21()
-            } catch (error) {
-              console.error('数据加载失败:', error);
-              this.loading = false;
-            } finally {
-              this.loading = false;
-            }
-          } else {
-            console.log('表单验证失败');
-            this.loading = false;
-          }
-        });
-      })
+      try {
+        this.loading = true;
+        this.pageIndex = 1;
+        this.pageSize = 500;
+        this.pageIndex2 = 1;
+        this.pageSize2 = 500;
+        this.dataMainWl11(),
+        this.dataMainWl21()
+      } catch (error) {
+        console.error('数据加载失败:', error);
+        this.loading = false;
+      } finally {
+        this.loading = false;
+      }
     },
     // 车间列表（检测中心下）
     selectDepartment(val) {
@@ -1255,15 +1249,10 @@ export default {
       this.click_main = {};
       this.tableData1 = [];
       this.total_main = 0;
-      // let startTime = "";
-      // let endTime = "";
-      let startTime = this.search.times[0];
-      let endTime = this.search.times[1];
-      if (new Date(startTime) > new Date(endTime)) {
-        this.$message.error('开始时间不能晚于结束时间');
-        this.loading = false;
-        return;
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
       let obj = {
         object: {
           validFlag: "1",
@@ -1286,19 +1275,21 @@ export default {
           { individualType: "json" }
         )
         .then((res) => {
+          console.log('search1    res', res)
           if (res.code == 0 || res.code == 200) {
+            console.log('search1......', res.data);
             this.tableData11 = res.data;
             this.loading = false;
           } else {
             this.loading = false;
-            this.$message.error(res.message);
+            // this.$message.error(res.message);
           }
           this.tableLoading11 = false;
         })
         .catch((err) => {
           this.loading = false;
           this.tableLoading11 = false;
-          this.$message.error(err.message);
+          // this.$message.error(err.message);
         });
     },
     // 已审核物料
@@ -1306,13 +1297,10 @@ export default {
       this.click_main2 = {};
       this.tableData2 = [];
       this.total_main2 = 0;
-      let startTime = this.search.times[0];
-      let endTime = this.search.times[1];
-      if (new Date(startTime) > new Date(endTime)) {
-        this.$message.error('开始时间不能晚于结束时间');
-        this.loading = false;
-        return;
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
       let obj = {
         object: {
           validFlag: "1",
@@ -1336,6 +1324,7 @@ export default {
         )
         .then((res) => {
           if (res.code == 0 || res.code == 200) {
+            console.log('search2......', res.data);
             this.tableData21 = res.data;
             this.loading = false;
           } else {
@@ -1388,7 +1377,7 @@ export default {
         .then((res) => {
           if (res.code == 0 || res.code == 200) {
             this.tableData1 = res.data.data.list;
-            this.cols = res.data.head;
+            this.cols = res.data.head;//如何动态获取表头！！！！
             this.total_main = res.data.data.total;
             if (this.tableData1.length > 0) {
               this.isShowSuppName = res.data.data.list[0].SUPP_NAME
@@ -1411,6 +1400,35 @@ export default {
           this.$message.error(err.message);
         });
     },
+    parseFieldWithBracket(val) {
+      // 初始化返回结果
+      const result = {
+        isValid: false, // 是否整体有效
+        restValue: '',  // 括号后的剩余内容
+        matchedValue: null // 匹配成功的拼接值
+      };
+      if (!val || typeof val !== 'string') {
+        return result;
+      }
+      const reg = /([\d,.]+)\(([\d,.]+)\)/;
+      const match = val.match(reg);
+      if (!match) {
+        return result;
+      }
+      const before = match[1].trim();
+      const inside = match[2].trim();
+
+      const bracketStartIndex = val.indexOf(')') + 1;
+      if (bracketStartIndex > 0) {
+        result.restValue = val.substring(bracketStartIndex);
+      }
+      console.log('val.....', val, 'bracketStartIndex.....', bracketStartIndex, 'restValue.....', result.restValue);
+      const numCheckReg = /^[\d,.]+$/;
+      if (!numCheckReg.test(before) || !numCheckReg.test(inside)) {
+        console.log('包含非数字内容，跳过：', before, inside);
+        return result;
+      }
+    },
     // 已审核数据
     dataMain2() {
       if (!this.click_main2 || !this.click_main2.MAT_NO) {
@@ -1448,6 +1466,7 @@ export default {
         .then((res) => {
           if (res.code == 0 || res.code == 200) {
             this.tableData2 = res.data.data.list;
+            console.log('tableData2....', this.tableData2)
             this.cols2 = res.data.head;
             this.total_main2 = res.data.data.total;
             if (this.tableData2.length > 0) {

src/views/approveManagement/components/secondApprove.vue

@@ -833,6 +833,7 @@ export default {
           return;
         }
       }
+      
       this.withdrawLoading = true;
       this.axios
         .post(
@@ -1253,6 +1254,7 @@ export default {
       this.saveLoading = true;
       this.axios
         .post(
+
           "pass/testManagement/v1/limssampletestds/testAnalysisUpdateLimsSampleTestDList",
           this.tableData3,
           { individualType: "json" }

src/views/approveManagement/router/index.js

@@ -61,6 +61,12 @@ const constantRouterMap = [
         component: (resolve) =>
           require(["../components/notificationConfig"], resolve),
       },
+      {
+        path: "approveOperationLogManagement",
+        name: "approveOperationLogManagement",
+        component: (resolve) =>
+        require(["../components/approveOperationLogManagement"], resolve),
+      }
     ],
   },
 ];

src/views/entrustedManagement/components/inspectionMaterials/inspectionMaterialsGit.vue

@@ -915,11 +915,11 @@ export default {
           carNo: this.search.carNo,
           contractNo: this.search.contractNo,
           planNo: this.search.planNo,
-          validFlag: '1',
+          validFlag: '1'
         },
         list: [this.search.testTypeCode],
-        'startTime': this.startTime,
-        'endTime': this.endTime,
+        startTime: this.startTime,
+        endTime: this.endTime,
         pageIndex: this.page.pageNum,
         pageSize: this.page.pageSize
       }

src/views/entrustedManagement/components/inspectionProudects/inspectionProudects.vue

@@ -26,14 +26,25 @@
           <el-input v-model="search.sampleNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
             style="width: 200px; margin-right: 10px" clearable></el-input>
         </el-form-item>
-        <el-form-item label="委托日期">
+        <br/>
+        <el-form-item label="委托开始时间">
           <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="开始日期" size="mini" style="width: 140px">
           </el-date-picker>
-          <span>至</span>
+        </el-form-item>
+        <el-form-item label="委托结束时间">
           <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="结束日期" size="mini" style="width: 140px">
           </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="委托日期">
+          <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px">
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker v-model="search.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px">
+          </el-date-picker> -->
           <!-- <el-date-picker
             v-model="search.times"
             type="daterange"
@@ -46,7 +57,7 @@
             value-format="yyyy-MM-dd"
           >
           </el-date-picker> -->
-        </el-form-item>
+        <!-- </el-form-item> -->
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" @click="searchData">查询</el-button>
           <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
@@ -1260,16 +1271,18 @@ export default {
     },
     mainData() {
       (this.saveRow = {}), (this.dataLoading = true);
-      let startTime = "";
-      let endTime = "";
-      if (!this.search.times) {
-        startTime = null;
-        endTime = null;
-      } else {
-        startTime =
-          formatDate(this.search.times[0], "yyyy-MM-dd") + " 00:00:00";
-        endTime = formatDate(this.search.times[1], "yyyy-MM-dd") + " 23:59:59";
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // if (!this.search.times) {
+      //   startTime = null;
+      //   endTime = null;
+      // } else {
+      //   startTime =
+      //     formatDate(this.search.times[0], "yyyy-MM-dd") + " 00:00:00";
+      //   endTime = formatDate(this.search.times[1], "yyyy-MM-dd") + " 23:59:59";
+      // }
       let obj = {
         sampleTypeCode: "480103",
         isBatch: "",
@@ -1318,13 +1331,15 @@ export default {
       (this.saveRow = {}), (this.invalidLoading = true);
       let startTime = "";
       let endTime = "";
-      if (!this.search.times) {
-        startTime = null;
-        endTime = null;
-      } else {
-        startTime = this.search.times[0];
-        endTime = this.search.times[1];
-      }
+      this.startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      this.endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // if (!this.search.times) {
+      //   startTime = null;
+      //   endTime = null;
+      // } else {
+      //   startTime = this.search.times[0];
+      //   endTime = this.search.times[1];
+      // }
       let tempobj = {
         object: {
           sampleTypeCode: "480103",

src/views/resourceManager/components/personMangement/personMangement.vue

@@ -66,13 +66,13 @@
                 >启用</el-button>
             </div>
         </div>
-        <!-- 人员信息表表格 -->
+                
+        <!-- 人员信息表表格:height="height_top" -->
         <div class="common-table-div" style="margin-bottom:0;margin-top:0">
             <el-table
                 v-loading="dataLoading"
                 ref="dataTable"
                 border
-                :height="height_top"
                 highlight-current-row
                 @selection-change="handleSelectionChange"
                 :data="table.list"
@@ -574,13 +574,13 @@
                             >启用</el-button>
                         </div>
                     </div>
-                    <!-- 人员合同信息表表格 -->
+                            
+                    <!-- 人员合同信息表表格 :height="height_bot"-->
                     <div class="common-table-div" style="margin-bottom:0;margin-top:0">
                         <el-table
                             v-loading="dataLoading2"
                             ref="dataTable2"
                             border
-                            :height="height_bot"
                             highlight-current-row
                             @selection-change="handleSelectionChange2"
                             @row-click="getRowCheck"