From 1ac72716fbc5d8271fa23475de4fb1408b7040ee Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 18:53:53 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 6b28543..396cc8b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -135,15 +135,14 @@
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.dataType = res.data.type
- console.log(produceList)
- produceList.forEach(item => {
- if(item.print_status == 1){
- item.print_status='宸叉墦鍗�'
- }
- else if (item.print_status == 0){
- item.print_status='鏈墦鍗�'
- }
- });
+ // produceList.forEach(item => {
+ // if(item.print_status == 1){
+ // item.print_status='宸叉墦鍗�'
+ // }
+ // else if (item.print_status == 0){
+ // item.print_status='鏈墦鍗�'
+ // }
+ // });
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -544,6 +543,20 @@
visible: true,
disabled: false
},
+ {
+ code: 'addAutomatically',
+ name: "鑷姩濉厖",
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'selectFill',
+ name: "閫変腑濉厖",
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
]
]
}
@@ -628,6 +641,39 @@
}
break
}
+ case 'addAutomatically' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ let val = 1
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ val=val*1+1
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'selectFill' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ let val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ console.log(item)
+ item[result.cell] = val
+ val=val*1+1
+ }
+ })
+ }
+ }
+ break
+ }
}
}
},
--
Gitblit v1.8.0