From 50efd9f19463da742e8c7b751bb4ab2c97acbf61 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 13:13:15 +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 | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 e946f08..0856a02 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
@@ -201,7 +201,7 @@
mode: 'row',
showStatus: true
},
- /*menuConfig: {
+ menuConfig: {
body: {
options: [
[
@@ -229,7 +229,7 @@
]
]
}
- },*/
+ },
//琛ㄥご鍙傛暟
columns: [
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
@@ -422,10 +422,15 @@
}
//brokenGrid.value.reloadData(brokenRow.damageDetail)
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
- brokenVisible.value = true
+ const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
+ //鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
+ if(column.title=="娆＄牬鏁伴噺"){
+ brokenVisible.value = true
+ }
+
},
- /*menuClick({menu, row, column}) {
+ menuClick({menu, row, column}) {
const $grid = xGrid.value
if ($grid) {
switch (menu.code) {
@@ -476,7 +481,7 @@
}
}
}
- },*/
+ },
}
@@ -639,6 +644,7 @@
addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
+ addListener(xGrid.value, gridOptions)
}
@@ -1113,6 +1119,7 @@
}
onMounted(() => {
window.addEventListener('keypress', qrcodeScanner);
+ addListener(xGrid.value, gridOptions)
})
// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
--
Gitblit v1.8.0