From 6f1acfd2086a1f8c2cb80afd3db4e534e44d545e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 14 八月 2026 10:33:51 +0800
Subject: [PATCH] fix: 报工明细创建日期格式化
---
src/views/productionManagement/productionOrder/index.vue | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index a9f61aa..c543f2e 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -11,6 +11,14 @@
style="width: 160px;"
@change="handleQuery" />
</el-form-item>
+ <el-form-item label="閿�鍞崟鍙�:">
+ <el-input v-model="searchForm.salesContractNo"
+ placeholder="璇疯緭鍏�"
+ clearable
+ prefix-icon="Search"
+ style="width: 160px;"
+ @change="handleQuery" />
+ </el-form-item>
<el-form-item label="浜у搧鍚嶇О:">
<el-input v-model="searchForm.productName"
placeholder="璇疯緭鍏�"
@@ -194,7 +202,7 @@
</el-dialog>
<MaterialLedgerDialog v-model="materialDialogVisible"
:order-row="currentMaterialOrder"
- @saved="getList" />
+ />
<MaterialDetailDialog v-model="materialDetailDialogVisible"
:order-row="currentMaterialDetailOrder"
@confirmed="getList" />
@@ -235,7 +243,6 @@
getProductOrderSource,
updateProductOrder,
} from "@/api/productionManagement/productionOrder.js";
- import { productWorkOrderPage } from "@/api/productionManagement/workOrder.js";
import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
import MaterialLedgerDialog from "@/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue";
import MaterialDetailDialog from "@/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue";
@@ -664,38 +671,11 @@
};
const getList = () => {
tableLoading.value = true;
- // 鏋勯�犱竴涓柊鐨勫璞★紝涓嶅寘鍚玡ntryDate瀛楁
const params = { ...searchForm.value, ...page };
params.entryDate = undefined;
productOrderListPage(params)
- .then(async res => {
- const records = res.data.records || [];
- // 涓烘瘡涓鍗曟煡璇㈠搴旂殑宸ュ簭杩涘害鏁版嵁
- const processPromises = records.map(async item => {
- if (item.npsNo) {
- try {
- const workOrderRes = await productWorkOrderPage({
- npsNo: item.npsNo,
- isProduction: 1,
- size: 100,
- });
- const workOrders = workOrderRes.data.records || [];
- // 鎸夌収宸ュ簭椤哄簭鎺掑簭锛堝鏋滄湁椤哄簭瀛楁锛屽亣璁句负 orderNum 鎴栨寜杩斿洖椤哄簭锛�
- // 杞崲涓� processRouteStatus 鏍煎紡
- const processRouteStatus = workOrders.map(wo => ({
- name: wo.operationName || "鏈煡宸ュ簭",
- percentage: wo.completionStatus > 100 ? 100 : wo.completionStatus,
- }));
- return { ...item, processRouteStatus };
- } catch (error) {
- console.error(`鑾峰彇宸ュ崟 ${item.npsNo} 杩涘害澶辫触:`, error);
- return { ...item, processRouteStatus: [] };
- }
- }
- return { ...item, processRouteStatus: [] };
- });
-
- tableData.value = await Promise.all(processPromises);
+ .then(res => {
+ tableData.value = res.data.records || [];
page.total = res.data.total;
tableLoading.value = false;
})
@@ -724,6 +704,7 @@
bomNo: row.bomNo || "",
description: data.description || "",
quantity: row.quantity || 0,
+ technologyRoutingId: data.technologyRoutingId,
orderId,
type: "order",
editable: !row.endOrder,
--
Gitblit v1.9.3