From 7d45449e189c4f5040a056ceb43a03f03a201e44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 四月 2024 10:39:26 +0800
Subject: [PATCH] 修改工单管理、流程卡管理发现的问题
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index 5d5bde7..1d68588 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -26,10 +26,15 @@
break
}
case 'delete': {
- request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.orderDetail.productName}`).then((res) => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let state = optionVal.value
+ console.log(startTime, endTime, state)
+ request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
if (res.code == 200) {
ElMessage.success(t('workOrder.deleteOk'))
- location.reload();
+ //location.reload();
+ router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -103,7 +108,7 @@
let pageNum = $ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
function getNowTime() {
const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
@@ -117,14 +122,14 @@
}
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
let state = optionVal.value
//绗竴娆″姞杞芥暟鎹�
-
+console.log('绗竴娆″姞杞芥暟鎹�:',state,startTime,endTime)
request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -247,13 +252,11 @@
, width: 130
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'orderDetail.productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'orderDetail.computeArea', title: t('order.computeArea'), showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.quantity', title: t('order.quantity'), width: 70},
- {field: 'orderDetail.computeGrossArea', title: t('order.trueGrossArea'),},
- {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
- {field: 'orderDetail.bendRadius', title: t('order.bendRadius'),},
- {field: 'orderDetail.processingNote', title: t('order.processingNote'),}
+ {field: 'order.project', title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+ {field: 'order.orderType', title: '璁㈠崟绫诲瀷', showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.grossArea', title: '闈㈢Н', width: 70},
+ {field: 'orderDetail.quantity', title: '鏁伴噺',},
+ {field: 'order.creator', title: '鍒涘缓浜�',},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
--
Gitblit v1.8.0