From 2700299978337e0f9603515472ea901be33e4c0d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 11:20:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
index 04022a8..bc683c9 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
@@ -64,7 +64,7 @@
body: {
options: [
[
- {code: 'selectTrimming', name: '璁剧疆缁熶竴淇竟',},
+ {code: 'selectTrimming', name: '璁剧疆缁熶竴淇竟',prefixIcon: 'vxe-icon-edit'},
{code: 'Exports', name: '鏁版嵁瀵煎嚭', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
{code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
],
@@ -85,7 +85,14 @@
gridRef: xGrid,
requiresRow: false,
openTrimming: async () => {
- emit ( 'select-trimming', true)
+ // 鑾峰彇褰撳墠閫変腑鐨勮褰�
+ const selectedRecords = xGrid.value.getCheckboxRecords();
+ // 鍙戦�佷簨浠剁粰鐖剁粍浠讹紝鍖呭惈閫変腑鐨勬暟鎹�
+ emit('select-trimming', {
+ action: 'open-trimming-dialog',
+ selectedData: selectedRecords && selectedRecords.length > 0 ? selectedRecords : null,
+ timestamp: Date.now()
+ });
}
},
{
@@ -136,16 +143,22 @@
}
return;
}
+
+
+ if (config.code === 'selectTrimming') {
+ config.openTrimming();
+ return;
+ }
// 娣诲姞纭鎻愮ず寮圭獥锛岃闂敤鎴锋槸鍚﹁繘琛屽綋鍓嶆搷浣�
ElMessageBox.confirm('鏄惁杩涜褰撳墠鎿嶄綔锛�', '纭鎿嶄綔', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- if (config.code === 'selectTrimming') {
- config.openTrimming();
- ElMessage.success(config.successMsg);
- }
+ // if (config.code === 'selectTrimming') {
+ // config.openTrimming();
+ // ElMessage.success(config.successMsg);
+ // }
}).catch(() => {
// 鐢ㄦ埛鐐瑰嚮鍙栨秷鍚庢墽琛岀殑閫昏緫
ElMessage.info('宸插彇娑堟搷浣�');
@@ -298,19 +311,38 @@
const data = gridOptions.data;
if (data) {
try {
- const updatedData = [];
- for (let i = 0; i < data.length; i++) {
- const item = data[i];
- const updatedItem = {
+ // 妫�鏌ユ槸鍚﹀彧瀵归�変腑鐨勯」鐩簲鐢ㄤ慨杈�
+ const shouldApplyToSelectedOnly = receivedData.selectedItemsOnly;
+ let targetData = data;
+
+ if (shouldApplyToSelectedOnly) {
+ // 鍙閫変腑鐨勬暟鎹簲鐢ㄤ慨杈�
+ targetData = receivedData.selectedGlassData || [];
+ if (!targetData || targetData.length === 0) {
+ ElMessage.warning('鏈�夋嫨浠讳綍椤圭洰锛屼慨杈规湭搴旂敤');
+ return;
+ }
+ }
+
+ const updatedData = data.map(item => {
+ // 濡傛灉鍙閫変腑椤瑰簲鐢紝妫�鏌ュ綋鍓嶉」鏄惁鍦ㄩ�変腑鍒楄〃涓�
+ if (shouldApplyToSelectedOnly) {
+ const isSelected = targetData.some(selectedItem => selectedItem.id === item.id);
+ if (!isSelected) {
+ return item; // 涓嶅湪閫変腑鍒楄〃涓紝涓嶄慨鏀�
+ }
+ }
+
+ // 搴旂敤淇竟鍊�
+ return {
...item,
- // 浠� receivedData 涓幏鍙栧搴旂殑鍊兼潵鏇存柊琛ㄦ牸鏁版嵁椤�
leftTrim: Number(receivedData.quicksetLeft),
downTrim: Number(receivedData.quicksetBottom),
rightTrim: Number(receivedData.quicksetRight),
upTrim: Number(receivedData.quicksetTop),
};
- updatedData.push(updatedItem);
- }
+ });
+
gridOptions.data = updatedData;
xGrid.value.loadData(updatedData);
} catch (error) {
--
Gitblit v1.8.0