From d917a8fe1fb46790c417d75c4a1b556ece40f5d7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 09 七月 2025 10:25:12 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 8258712..6246e91 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -426,18 +426,10 @@
},
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- // {code: 'empty', name: '娓呯┖鎶ュ伐鏁伴噺'},
- // {code: 'sameCompletion', name: '瀹屽伐鐩稿悓'},
- // {code: 'sameDamage', name: '娆＄牬鐩稿悓'},
- // {code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�'},
- // {code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�'},
{code: 'saveReportingWork', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
{code: 'saveReportingWorkReview', name: t('reportingWorks.saveAndReview'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
{code: 'saveWorkStorage', name: t('reportingWorks.saveWorkStorage'), status: 'primary', icon: 'vxe-icon-save'},
],
- // import: false,
- // export: true,
- // print: true,
zoom: true,
custom: true
},
@@ -1154,7 +1146,6 @@
//涓嬫媺娆鹃�夋嫨宸ュ簭鏃舵煡璇�
const getWork = () => {
-
let processId = titleUploadData.value.processId
if (processId == "" || processId == null) {
ElMessage.warning(t('reportingWorks.theProcessCardNumberCannotBeEmpty'))
@@ -1278,6 +1269,7 @@
}
});
xGrid.value.reloadData(modifiedCollection)
+ hideButton()
} else {
ElMessage.warning(res.msg)
}
@@ -1511,15 +1503,33 @@
}
const hideButton = () => {
- if (btnValue == false){
- const els = document.querySelectorAll('.inventory_content');
+ //鑾峰彇鏈�鍚庝竴閬撳伐搴�
+ const parts = technologicalProcess.split('->');
+ let last = parts[parts.length - 1];
+ if (last === '') {
+ last = null;
+ }
+ const els = document.querySelectorAll('.inventory_content');
+ //鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鎸夐挳鍐呭
+ if (btnValue == false || last != titleUploadData.value.thisProcess){
els.forEach(el => {
el.style.display = 'none';
});
+ } else {
+ els.forEach(el => {
+ el.style.display = '';
+ });
+ let buttons = {
+ code: 'saveWorkStorage',
+ name: t('reportingWorks.saveWorkStorage'),
+ status: 'primary',
+ icon: 'vxe-icon-save'
+ }
+ gridOptions.toolbarConfig.buttons.push(buttons)
}
gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
// 濡傛灉 type 涓嶄负绌烘椂锛岄殣钘� print 鎸夐挳
- if (btnValue == false && button.code === 'saveWorkStorage') {
+ if (btnValue == false || last != titleUploadData.value.thisProcess && button.code === 'saveWorkStorage' ) {
return false; // 闅愯棌 print 鎸夐挳
}
--
Gitblit v1.8.0