From 07c8bd5f0d9deac8a8026fd4abc1074dbac29330 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 08 二月 2025 15:03:44 +0800
Subject: [PATCH] 提交 产品审核跳转不经过序号
---
north-glass-erp/northglass-erp/package.json | 2
north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue | 33 ++++++++++-
north-glass-erp/northglass-erp/package-lock.json | 86 +++++++++++++++-------------
3 files changed, 78 insertions(+), 43 deletions(-)
diff --git a/north-glass-erp/northglass-erp/package-lock.json b/north-glass-erp/northglass-erp/package-lock.json
index e2daf7b..faf7f69 100644
--- a/north-glass-erp/northglass-erp/package-lock.json
+++ b/north-glass-erp/northglass-erp/package-lock.json
@@ -26,7 +26,7 @@
"vue-router": "^4.2.4",
"vue3-print-nb": "^0.1.4",
"vxe-pc-ui": "^4.0.78",
- "vxe-table": "^4.7.57",
+ "vxe-table": "^4.10.6",
"xe-utils": "^3.5.14",
"xlsx": "^0.18.5"
},
@@ -854,12 +854,16 @@
}
},
"node_modules/@vxe-ui/core": {
- "version": "1.0.12",
- "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-1.0.12.tgz",
- "integrity": "sha512-s79mQw6uYSbTVGBWbxrisHwJV1b770vZMT9XpY3khcFQhXNo25+PS3FLrNCSsBBJR0ZkBLOXDER/ft9DIqgFTw==",
+ "version": "4.0.29",
+ "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.29.tgz",
+ "integrity": "sha512-F6ZJ7+x48qBDx7ME/GdmRN5OECha9wnNy0IIA8AAWHrjhTFY5yBBE+t2ULO6wgwkFB2E74CtYF/2/nprpGrdlA==",
+ "license": "MIT",
"dependencies": {
- "dom-zindex": "^1.0.4",
- "xe-utils": "^3.5.28"
+ "dom-zindex": "^1.0.6",
+ "xe-utils": "^3.7.0"
+ },
+ "peerDependencies": {
+ "vue": "^3.2.0"
}
},
"node_modules/acorn": {
@@ -1196,9 +1200,10 @@
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
},
"node_modules/dom-zindex": {
- "version": "1.0.4",
- "resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.4.tgz",
- "integrity": "sha512-PNk7u71TJ1C9Lwjjp5nNuQcVWuECFMmr9kZAwi2UbgWUM7jXdTCe4O4x5bhLUa07jpcZUVA5Du3ho7/FXzS9Ng=="
+ "version": "1.0.6",
+ "resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.6.tgz",
+ "integrity": "sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA==",
+ "license": "MIT"
},
"node_modules/dompurify": {
"version": "2.5.6",
@@ -7148,19 +7153,21 @@
}
},
"node_modules/vxe-pc-ui": {
- "version": "4.0.78",
- "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.0.78.tgz",
- "integrity": "sha512-fle8WRkStPnWJP7w40t0ComNJ86ArVrsEtmUGau1JFVm9xG5LRG2n3Q0NDrTrW34T36XM5sr8FDuQmBQ7hhwuQ==",
+ "version": "4.3.80",
+ "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.3.80.tgz",
+ "integrity": "sha512-sIwamEzbVHzVXggchylgiKjneU8cozu440ZNhQy8ZG10ENYY4CsdMlZukxAphk75Ygq96t2+JvN5+MRM+mcsCg==",
+ "license": "MIT",
"dependencies": {
- "@vxe-ui/core": "^1.0.12"
+ "@vxe-ui/core": "^4.0.29"
}
},
"node_modules/vxe-table": {
- "version": "4.7.57",
- "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.57.tgz",
- "integrity": "sha512-SZNa31rv0iz5MMfJVs4hVmPBO3q+rsB+2IN2bB5GrPtR3cI3DaJScpA6FpX8U34+eM6coQ3sHpF+li+7z9LvlA==",
+ "version": "4.10.6",
+ "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.10.6.tgz",
+ "integrity": "sha512-NLzRPRwreJHuIz7W9C+M/o8xb5M5SxIP7qRUMF/GKl9XguQM3oG9owqcPi3aBpZdsWoAyJtMjgSRPyPJn28yXQ==",
+ "license": "MIT",
"dependencies": {
- "vxe-pc-ui": "^4.0.78"
+ "vxe-pc-ui": "^4.3.80"
}
},
"node_modules/webpack-sources": {
@@ -7231,9 +7238,10 @@
}
},
"node_modules/xe-utils": {
- "version": "3.5.28",
- "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.28.tgz",
- "integrity": "sha512-oeLLJ0b54QdOSSgYQ9TiKW/xAGrc9r0weCA/5UfyGdm3n3js4cNOuuf9Tml7UwgBQpl4uWMbMwUZKLh2yqPF3A=="
+ "version": "3.7.0",
+ "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.7.0.tgz",
+ "integrity": "sha512-2pndXCEivB7+xWCdCDth/LJ5ngAAstUOoHTGBQauwTqc03M3Cl1tYbNhPUqi4Lcj+UNZnnc8fANbFWjb6TMx6A==",
+ "license": "MIT"
},
"node_modules/xlsx": {
"version": "0.18.5",
@@ -7804,12 +7812,12 @@
}
},
"@vxe-ui/core": {
- "version": "1.0.12",
- "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-1.0.12.tgz",
- "integrity": "sha512-s79mQw6uYSbTVGBWbxrisHwJV1b770vZMT9XpY3khcFQhXNo25+PS3FLrNCSsBBJR0ZkBLOXDER/ft9DIqgFTw==",
+ "version": "4.0.29",
+ "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.0.29.tgz",
+ "integrity": "sha512-F6ZJ7+x48qBDx7ME/GdmRN5OECha9wnNy0IIA8AAWHrjhTFY5yBBE+t2ULO6wgwkFB2E74CtYF/2/nprpGrdlA==",
"requires": {
- "dom-zindex": "^1.0.4",
- "xe-utils": "^3.5.28"
+ "dom-zindex": "^1.0.6",
+ "xe-utils": "^3.7.0"
}
},
"acorn": {
@@ -8044,9 +8052,9 @@
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
},
"dom-zindex": {
- "version": "1.0.4",
- "resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.4.tgz",
- "integrity": "sha512-PNk7u71TJ1C9Lwjjp5nNuQcVWuECFMmr9kZAwi2UbgWUM7jXdTCe4O4x5bhLUa07jpcZUVA5Du3ho7/FXzS9Ng=="
+ "version": "1.0.6",
+ "resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.6.tgz",
+ "integrity": "sha512-FKWIhiU96bi3xpP9ewRMgANsoVmMUBnMnmpCT6dPMZOunVYJQmJhSRruoI0XSPoHeIif3kyEuiHbFrOJwEJaEA=="
},
"dompurify": {
"version": "2.5.6",
@@ -13825,19 +13833,19 @@
}
},
"vxe-pc-ui": {
- "version": "4.0.78",
- "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.0.78.tgz",
- "integrity": "sha512-fle8WRkStPnWJP7w40t0ComNJ86ArVrsEtmUGau1JFVm9xG5LRG2n3Q0NDrTrW34T36XM5sr8FDuQmBQ7hhwuQ==",
+ "version": "4.3.80",
+ "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.3.80.tgz",
+ "integrity": "sha512-sIwamEzbVHzVXggchylgiKjneU8cozu440ZNhQy8ZG10ENYY4CsdMlZukxAphk75Ygq96t2+JvN5+MRM+mcsCg==",
"requires": {
- "@vxe-ui/core": "^1.0.12"
+ "@vxe-ui/core": "^4.0.29"
}
},
"vxe-table": {
- "version": "4.7.57",
- "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.57.tgz",
- "integrity": "sha512-SZNa31rv0iz5MMfJVs4hVmPBO3q+rsB+2IN2bB5GrPtR3cI3DaJScpA6FpX8U34+eM6coQ3sHpF+li+7z9LvlA==",
+ "version": "4.10.6",
+ "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.10.6.tgz",
+ "integrity": "sha512-NLzRPRwreJHuIz7W9C+M/o8xb5M5SxIP7qRUMF/GKl9XguQM3oG9owqcPi3aBpZdsWoAyJtMjgSRPyPJn28yXQ==",
"requires": {
- "vxe-pc-ui": "^4.0.78"
+ "vxe-pc-ui": "^4.3.80"
}
},
"webpack-sources": {
@@ -13882,9 +13890,9 @@
"requires": {}
},
"xe-utils": {
- "version": "3.5.28",
- "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.5.28.tgz",
- "integrity": "sha512-oeLLJ0b54QdOSSgYQ9TiKW/xAGrc9r0weCA/5UfyGdm3n3js4cNOuuf9Tml7UwgBQpl4uWMbMwUZKLh2yqPF3A=="
+ "version": "3.7.0",
+ "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.7.0.tgz",
+ "integrity": "sha512-2pndXCEivB7+xWCdCDth/LJ5ngAAstUOoHTGBQauwTqc03M3Cl1tYbNhPUqi4Lcj+UNZnnc8fANbFWjb6TMx6A=="
},
"xlsx": {
"version": "0.18.5",
diff --git a/north-glass-erp/northglass-erp/package.json b/north-glass-erp/northglass-erp/package.json
index 74ec9ec..99f8302 100644
--- a/north-glass-erp/northglass-erp/package.json
+++ b/north-glass-erp/northglass-erp/package.json
@@ -26,7 +26,7 @@
"vue-router": "^4.2.4",
"vue3-print-nb": "^0.1.4",
"vxe-pc-ui": "^4.0.78",
- "vxe-table": "^4.7.57",
+ "vxe-table": "^4.10.6",
"xe-utils": "^3.5.14",
"xlsx": "^0.18.5"
},
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
index cc5e3d5..bdfc1b2 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderSizeCheck.vue
@@ -38,11 +38,11 @@
keyboardConfig:{
isArrow: true,
isDel: true,
- isEnter: true,
isTab: true,
isEdit: true,
isChecked: true,
- enterToTab:true
+ // enterToTab:true,
+ //isEnter: true,
},
customConfig: {
@@ -128,15 +128,41 @@
})
-const editClosedEvent = ({ row, column,rowIndex}) => {
+const editClosedEvent = ({ row, column,rowIndex,columnIndex}) => {
const $table = props.OrderDetail
let checkVal = row[column.property]*1
const oldVal = $table.getTableData().fullData[rowIndex][column.property]*1
if(checkVal!==oldVal){
row[column.property]=null
}
+}
+
+const handleKeyDown = (evnt) =>{
+ const length = xGrid.value.getTableData().fullData.length
+ if(evnt.$event.keyCode === 13 ){
+ const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
+ let nextRowIndex = xGrid.value.getRowIndex(row) + 1
+ switch (column.field){
+ case 'width':
+ xGrid.value.setSelectCell(row, 'height')
+ break;
+ case 'height':
+ xGrid.value.setSelectCell(row, 'quantity')
+ break;
+ case 'quantity':
+ if(nextRowIndex === length){
+ return
+ }
+ const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
+ xGrid.value.setCurrentRow(nextRow)
+ xGrid.value.scrollToRow(nextRow)
+ xGrid.value.setSelectCell(nextRow, 'width')
+ break;
+ }
+
+ }
}
</script>
@@ -150,6 +176,7 @@
v-bind="gridOptions"
v-on="gridEvents"
@edit-closed="editClosedEvent"
+ @keydown="handleKeyDown"
>
</vxe-grid>
</div>
--
Gitblit v1.8.0