From aa81c2e975852f293e4b2706e0f667c9cbaf38c9 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 09 九月 2025 14:37:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue | 1 -
north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue | 1 -
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
index c3abbf8..6506bbe 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
@@ -119,7 +119,6 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns:[
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{field: 'select',type: "checkbox",title: t('basicData.check'), width: 80,fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'reportingWorkTime', width: 120, title: t('reportingWorks.reportingWorkTime'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
index eac9f3a..a203bfe 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -286,7 +286,6 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
// {title: t('basicData.operate'), width: 55, slots: { default: 'button_slot' },fixed:"left"},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
index e076819..20a661f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
@@ -142,7 +142,6 @@
},//琛ㄥご鍙傛暟
columns:[
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'reviewStatus',title: t('basicData.review'), width: 50, slots: { default: 'state' }},
--
Gitblit v1.8.0