From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 1885c7f..d09e33e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -105,12 +105,19 @@
if (project==''){
project=null
}
+
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ gridOptions.toolbarConfig.buttons[2].visible=false
+ let roleId=res.data.user
+ if (roleId=='1' || roleId=='17'){
+ gridOptions.toolbarConfig.buttons[2].visible=true
+ }
+
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -217,6 +224,7 @@
buttons: [
{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
+ {code: 'detailsPrint', name: '鏄庣粏鎵撳嵃', status: 'primary'},
],
@@ -271,6 +279,26 @@
return;
}
+ case 'detailsPrint': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+
+ let orderIdList = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ orderIdList += selectRecords[i].order_id
+ } else {
+ orderIdList += selectRecords[i].order_id + "|"
+ }
+ }
+ let array = orderIdList.split('|');
+ router.push({path: '/main/processCard/PrintFlowCardDetails', query: {printList: JSON.stringify(selectRecords),checkedValue:checkedValue.value.value}})
+ return;
+
+ }
}
}
}
--
Gitblit v1.8.0