From e24107cb6c8db5ddb4653c9e8150e362c34d96cf Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 06 八月 2025 15:55:34 +0800
Subject: [PATCH] 提交 订单流程卡界面
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 4d16b09..84cc787 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -120,19 +120,14 @@
xGrid.value.clearMergeCells()
xGrid.value.clearMergeFooterItems()
xGrid.value.updateFooter()
- //title.value[title.value.length-1]
- const users = [
- { name: 'Alice', age: 25 },
- { name: 'Bob', age: 30 },
- { name: 'Charlie', age: 20 }
- ];
-
- // const olderUsers = users.filter(user => user.age > 25);
- // console.log(olderUsers);
- // const lastProcess = title.value[title.value.length-1].process
- // const filter = data.value.filter(item => item.quantity > (parseInt(item['reportWorkQuantity'][lastProcess]) ))
+ const lastProcess = title.value[title.value.length-1].process
+ const filter = data.value.filter(item => {
+ const lastFinish = parseInt(item['reportWorkQuantity'][lastProcess])
+ const allFinish = item.glassQuantity*1
+ return allFinish>lastFinish
+ })
// console.log(filter)
- // xGrid.value.loadData(filter)
+ xGrid.value.loadData(filter)
break
}
}
@@ -264,9 +259,9 @@
<template #type>
<vxe-select @change="changeProcessType" v-model="orderType" >
- <vxe-option :value="1" :label="'瀹屾暣妯″紡'"></vxe-option>
- <vxe-option :value="2" :label="'鍗曠墖妯″紡'"></vxe-option>
- <vxe-option :value="3" :label="'寰呭畬宸�'"></vxe-option>
+ <vxe-option :value="1" :label="t('order.merge')"></vxe-option>
+ <vxe-option :value="2" :label="t('order.layer')"></vxe-option>
+ <vxe-option :value="3" :label="t('order.notFinish')"></vxe-option>
</vxe-select>
</template>
</vxe-grid>
--
Gitblit v1.8.0