From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 e244a17..2381dce 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
@@ -127,16 +127,16 @@
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
+request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
- gridOptions.toolbarConfig.buttons[2].visible=false
+ /*gridOptions.toolbarConfig.buttons[2].visible=false
let roleId=res.data.user
if (roleId=='1' || roleId=='17'){
gridOptions.toolbarConfig.buttons[2].visible=true
- }
-
+ }*/
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -147,8 +147,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
+
let orderId=form.orderId
let project=form.project
@@ -160,9 +159,9 @@
}
let state = optionVal.value
- request.post(`/processCard/selectPrintFlowCard/${startTime}/${endTime}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectPrintFlowCard/${orderInfo.workOrderDate}/${orderId}/${project}/${userId}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
-
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
@@ -225,6 +224,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {field: 'batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110,filterMethod: filterChanged},
{
field: 'quantity',
title: t('order.quantity'),
--
Gitblit v1.8.0