From 82ced2685d0fb586930c5866a6f4fefcf6f7dc36 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 15:28:50 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue | 4 ++--
north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue
index 88b6107..928d073 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue
@@ -340,7 +340,7 @@
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
diff --git a/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
index 713a6ef..3f43be0 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
@@ -218,7 +218,7 @@
{field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderDetail.height',width: '100', title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'area',width: '100', title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'area',width: '100', title: t('order.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'money',width: '100', title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'order.project',width: '100', title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'order.customerName',width: '100', title: t('order.customers'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -247,7 +247,7 @@
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList = ['quantity']
+ let footList = ['quantity','area','money']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
--
Gitblit v1.8.0