修改bug

This commit is contained in:
‘937886381’
2024-03-29 16:56:21 +08:00
parent c8913f192c
commit 7a14b2846a
21 changed files with 992 additions and 803 deletions

View File

@@ -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()
},

View File

@@ -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()
},

View File

@@ -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: {

View File

@@ -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:
-->

View File

@@ -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 />