更新5-5

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -177,9 +177,9 @@
                     <span>{{ scope.row.weight }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="描述" prop="description" min-width="130px" align="center">
+                <el-table-column label="小计" prop="description" min-width="130px" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.description }}</span>
+                    <span>{{ scope.row.subtotal }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -228,9 +228,9 @@
                     <span>{{ scope.row.weight }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="描述" prop="description" min-width="130px" align="center">
+                <el-table-column label="小计" prop="description" min-width="130px" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.description }}</span>
+                    <span>{{ scope.row.subtotal }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -317,9 +317,9 @@
                   <span>{{ scope.row.useinbar }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="描述" prop="description" min-width="130px" align="center">
+              <el-table-column label="小计" prop="description" min-width="130px" align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.description }}</span>
+                  <span>{{ scope.row.subtotal }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -402,9 +402,9 @@
                     <span>{{ scope.row.weight }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="描述" prop="description" min-width="130px" align="center">
+                <el-table-column label="小计" prop="description" min-width="130px" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.description }}</span>
+                    <span>{{ scope.row.subtotal }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -491,9 +491,9 @@
                     <span>{{ scope.row.weight }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="描述" prop="description" min-width="130px" align="center">
+                <el-table-column label="小计" prop="description" min-width="130px" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.description }}</span>
+                    <span>{{ scope.row.subtotal }}</span>
                   </template>
                 </el-table-column>
               </el-table>

src/views/inventoryManagement/feedContract/index.vue

@@ -35,7 +35,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -252,7 +253,8 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {

src/views/inventoryManagement/inventoryList/index.vue

@@ -27,7 +27,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -264,7 +265,8 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {

src/views/inventoryManagement/laborConsumption/index.vue

@@ -43,7 +43,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -278,8 +279,8 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -653,10 +654,6 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{margin-top:10px;}
-  
- </style>
  <style lang="scss">
    .typeSelect span .el-popover__reference .el-input--suffix {
        .el-input__inner{

src/views/inventoryManagement/laborConsumption/index改.vue

@@ -43,7 +43,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -280,8 +281,8 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -665,10 +666,6 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{margin-top:10px;}
-  
- </style>
  <style lang="scss">
    .typeSelect span .el-popover__reference .el-input--suffix {
        .el-input__inner{

src/views/inventoryManagement/statistics/index.vue

@@ -21,7 +21,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -285,7 +286,8 @@ export default {
       },
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 -10
     }
   },
 
@@ -442,5 +444,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  
+
 </style>

src/views/inventoryManagement/systemConsumption/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
@@ -37,7 +36,8 @@
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
-        @selection-change="handleSelectionChange"
+        @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -181,7 +181,8 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
 
@@ -407,8 +408,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  // .operation{margin-top:10px;}
-  .search{margin-top:10px;}
-  
- </style>

src/views/inventoryManagement/warehousing/index.vue

@@ -41,7 +41,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -451,7 +452,8 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -1265,7 +1267,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{margin-top:10px;}
-  
-</style>

src/views/inventoryManagement/warehousing/index改.vue

@@ -41,7 +41,8 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -452,7 +453,8 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -1269,7 +1271,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{margin-top:10px;}
-  
-</style>

src/views/inventoryManagement/warning/index.vue

@@ -20,7 +20,8 @@
             style="width: 100%;"
             :row-style="rowStyle"
             :cell-style="cellStyle"
-            class="elTable table-fixed"
+            class="elTable table-fixed"
+            :max-height="myHeight"
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
             <el-table-column label="预混配方" min-width="130px" align="center" prop="pftname" />
@@ -252,7 +253,8 @@ export default {
       requestParam: {},
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 110
     }
   },
 

src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -13,7 +13,7 @@
           </div>
         </div>
       </template>
-      <div class="see" :style="styleObject">
+      <div class="see" style="max-height: 600px;overflow-y: auto;overflow-x: hidden">
         <el-row :gutter="10">
           <el-col :span="10">
             <div class="train">
@@ -176,11 +176,7 @@ export default {
       chartLine: null, chartLine_data: {}, chartName: '',
       // rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      myHeight: document.documentElement.clientHeight - 85 - 200,
-      styleObject:{
-        maxHeight: document.documentElement.clientHeight - 85 - 200-800,
-        overflowY: 'auto','overflowX': 'hidden'
-      }
+      myHeight: document.documentElement.clientHeight - 85 - 200
     }
   },
   watch: {
@@ -253,7 +249,6 @@ export default {
     },
     // TMR设备列表
     getList1() {
-      console.log(document.documentElement.clientHeight - 85 - 200-300,'777')
       this.table1.listLoading = true
       this.table1.getdataListParm.name = this.methodname
       this.table1.getdataListParm.parammaps.optdevice = this.optdevice