From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 2d7f85b..7a95bd4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -22,11 +22,9 @@
break
}
case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
break
}
}
@@ -102,11 +100,12 @@
let endTime = orderInfo.workOrderDate[1]
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -116,17 +115,19 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
+ gridOptions.loading = true
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
xGrid.value.loadData(res.data.data)
+ orderInfo.workOrderDate = res.data.selectDate
gridOptions.loading = false
+
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -156,7 +157,7 @@
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
--
Gitblit v1.8.0