修改bug

src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue

@@ -4,7 +4,8 @@
     <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" />
 
     <!-- 列表 -->
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
@@ -33,10 +34,10 @@ import {
 import basicPage from '../../mixins/basic-page';
 import moment from 'moment';
 import addOrUpdate from './dialogForm.vue';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
 	name: 'QualityInspectionBoxBtn',
-  mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
   components: { addOrUpdate },
 	data() {
     return {
@@ -114,7 +115,7 @@ export default {
 			// 查询参数
 			listQuery: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				inspectionDetContent: null,
       },
       addOrUpdateVisible: false,

src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue

@@ -4,7 +4,8 @@
     <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="buttonClick" />
 
     <!-- 列表 -->
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
@@ -34,10 +35,11 @@ import basicPage from './basic-page';
 import moment from 'moment';
 import addOrUpdate from './dialogForm.vue';
 import ProcessBomList from './ProcessBomList.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import row from './row.vue';
 export default {
 	name: 'QualityInspectionBoxBtn',
-  mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
   components: { addOrUpdate, ProcessBomList },
 	data() {
     return {
@@ -123,7 +125,7 @@ export default {
 			// 查询参数
 			listQuery: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
         userName: null,
         nickName:null
       },

src/views/quality/base/qualityHotMaterial/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
       :limit="listQuery.pageSize" :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -29,6 +29,7 @@ import {
   deleteQualityHotMaterial,
   getHotMaterialAllList
 } from '@/api/base/qualityHotMaterial';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
 	{
@@ -74,7 +75,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -207,7 +208,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
           this.listQuery.materialId = val.materialId ? val.materialId : undefined;
           this.listQuery.checkTime = val.checkTime ? val.checkTime : undefined;
 					this.getDataList();
@@ -215,7 +216,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};

src/views/quality/base/qualityInspectionDet/index.vue

@@ -4,7 +4,7 @@
     <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
 
     <!-- 列表 -->
-    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
+    <base-table :max-height="tableH" :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
       @emitFun="handleEmitFun">
       <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
         @clickBtn="handleTableBtnClick" />
@@ -59,14 +59,14 @@ import {
 	getQualityInspectionDetPage,
 	exportQualityInspectionDetExcel,
 } from '@/api/base/qualityInspectionDet';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import moment from 'moment';
 
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 export default {
 	name: 'QualityInspectionDet',
-	mixins: [basicPageMixin],
+  mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			typeList: [], // 检测类型列表
@@ -153,7 +153,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				content: null,
 				createTime: [],
 			},

src/views/quality/base/qualityInspectionType/index.vue

@@ -4,8 +4,8 @@
     <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
 
     <!-- 列表 -->
-    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
-      @emitFun="handleEmitFun">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize"
+      :table-data="list" @emitFun="handleEmitFun">
       <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
         @clickBtn="handleTableBtnClick" />
     </base-table>
@@ -61,10 +61,10 @@ import {
 	exportQualityInspectionTypeExcel,
 } from '@/api/base/qualityInspectionType';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
 	name: 'QualityInspectionType',
-	mixins: [basicPageMixin],
+  mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			tableBtn: [

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-25 16:07:07
+ * @LastEditTime: 2024-03-29 14:08:18
  * @Description:
 -->
 <template>
@@ -24,12 +24,12 @@
 // import unitDict from './unitDict';
 // import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
   getMaterialUseLogPage,
   getWorkOrderList,
   exportEnergyPlcExcel
 } from '@/api/quality/materialTraceability';
-
 const tableProps = [
   {
     prop: 'materialName',
@@ -73,6 +73,7 @@ const tableProps = [
 ];
 
 export default {
+  mixins: [tableHeightMixin],
   // mixins: [basicPage],
   data() {
     return {
@@ -82,7 +83,7 @@ export default {
       //   // exportURL: exportPackingExcel,
       // },
       tableProps,
-      tableH: this.tableHeight(260),
+      // tableH: this.tableHeight(260),
       tableBtn: [
         this.$auth.hasPermi(`base:packaging-print-log:update`)
           ? {
@@ -174,9 +175,9 @@ export default {
     // AddOrUpdate,
   },
   created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
+    // window.addEventListener('resize', () => {
+    //   this.tableH = this.tableHeight(260)
+    // })
     this.getList()
     this.getDict()
   },

src/views/quality/monitoring/originalGlassRetrace/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-21 15:17:05
+ * @LastEditTime: 2024-03-29 14:08:30
  * @Description:
 -->
 <template>
@@ -25,6 +25,8 @@
 // import basicPage from '../mixins/basic-page';
 import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 import {
   getOriginalGlassRetrace,
   getWorkOrderList,
@@ -85,6 +87,7 @@ const tableProps = [
 
 export default {
   // mixins: [basicPage],
+  mixins: [tableHeightMixin],
   data() {
     return {
       // urlOptions: {
@@ -119,7 +122,7 @@ export default {
         startTime: undefined,
         endTime:undefined,
       },
-      tableH: this.tableHeight(260),
+      // tableH: this.tableHeight(260),
       formConfig: [
         {
           type: 'select',
@@ -184,9 +187,9 @@ export default {
     // AddOrUpdate,
   },
   created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
+    // window.addEventListener('resize', () => {
+    //   this.tableH = this.tableHeight(260)
+    // })
     this.getList()
     this.getDict()
   },

src/views/quality/monitoring/processTraceability/index.vue

@@ -2,13 +2,14 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-20 09:25:40
+ * @LastEditTime: 2024-03-29 15:32:33
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="list">
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="list">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
@@ -30,6 +31,7 @@ import {
   // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
   {
     prop: 'name',
@@ -78,7 +80,7 @@ const tableProps = [
 ];
 
 export default {
-  // mixins: [basicPage],
+  mixins: [tableHeightMixin],
   data() {
     return {
       // urlOptions: {

src/views/quality/monitoring/processTraceabilityDetail/components/SmallTitle.vue

@@ -1,14 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-09 16:32:21
- * @LastEditTime: 2023-11-09 16:32:21
- * @LastEditors: zhp
- * @Description:
--->
-<!--
- * @Author: zhp
- * @Date: 2023-11-07 19:28:13
- * @LastEditTime: 2023-11-08 14:11:43
+ * @LastEditTime: 2024-03-29 14:21:52
  * @LastEditors: zhp
  * @Description:
 -->

src/views/quality/monitoring/processTraceabilityDetail/index.vue

@@ -1,17 +1,10 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-28 10:41:50
- * @LastEditTime: 2023-11-28 10:49:43
+ * @LastEditTime: 2024-03-29 14:14:13
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2023-10-18 12:25:46
-    description:
--->
-
 <template>
 	<div class="app-container process-flow-view">
 		<ProcessInfo />