From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 02ee91d..3a702f0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -14,6 +14,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
+import {changeFilterEvent,filterChanged} from "@/hook"
//璇█鑾峰彇
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
@@ -84,12 +85,13 @@
orderOtherMoney.value.forEach(item => {
let column = {
field: `${item.column}`,
- width: 60,
+ width: 100,
title: item.alias,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
}
- //columns.push(column)
- console.log(column)
gridOptions.columns.push(column)
})
@@ -101,11 +103,7 @@
}
})
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
+
function padLeftZero(str) {
return ('00' + str).substr(str.length)
@@ -119,14 +117,7 @@
}
-//绛涢�夋柟娉�
-const filterChanged = ({option, row, column}) => {
- if (option.data) {
- return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
- }
- return true
- //@filter-change="filterChanged"
-}
+
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -202,7 +193,8 @@
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
- {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'}
+ {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -718,9 +710,7 @@
<template>
<div style="width: 75%;height: 90%">
-
- <div class="common-layout" style="width: 100%;height: 100%">
-
+ <div class="common-layout">
<el-button
id="searchButton1"
:icon="ArrowLeftBold"
@@ -843,7 +833,8 @@
}
.common-layout {
- height: 100%;
+ width: 99%;
+ height: 96%;
}
.header {
--
Gitblit v1.8.0