From c05b81c7f50df80ab247a05f9f92af2d799e77cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 10 四月 2026 15:59:04 +0800
Subject: [PATCH] feat:1.销售添加是否生产 2.生产订单添加备注
---
src/views/productionManagement/productionOrder/index.vue | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 04f5a45..887b6f7 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -1,3 +1,4 @@
+<!-- 鐢熶骇璁㈠崟 -->
<template>
<div class="app-container">
<div class="search_form">
@@ -57,11 +58,13 @@
@selection-change="handleSelectionChange"
@pagination="pagination">
<template #completionStatus="{ row }">
- <el-progress
- :percentage="toProgressPercentage(row?.completionStatus)"
- :color="progressColor(toProgressPercentage(row?.completionStatus))"
- :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
- />
+ <div class="progress-link" @click="goProductionDetail(row)">
+ <el-progress
+ :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
+ />
+ </div>
</template>
</PIMTable>
</div>
@@ -114,11 +117,31 @@
const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
const { proxy } = getCurrentInstance();
+ const { priority_type } = proxy.useDict("priority_type");
const router = useRouter();
const isShowNewModal = ref(false);
const tableColumn = ref([
+ {
+ label: "浼樺厛绾�",
+ prop: "priority",
+ width: '100px',
+ dataType: "tag",
+ formatData: val => proxy.selectDictLabel(priority_type.value, val),
+ formatType: val => {
+ const v = Number(val);
+ if (v === 0) return "danger"; // 绾㈣壊
+ if (v === 1) return "warning"; // 榛勮壊
+ if (v === 2) return "success"; // 缁胯壊
+ return "";
+ },
+ },
+ {
+ label: "鐢熶骇鎵瑰彿",
+ prop: "batchNo",
+ width: '120px',
+ },
{
label: "鐢熶骇璁㈠崟鍙�",
prop: "npsNo",
@@ -142,6 +165,11 @@
{
label: "瑙勬牸",
prop: "specificationModel",
+ width: '120px',
+ },
+ {
+ label: "鏂欏彿",
+ prop: "materialCode",
width: '120px',
},
{
@@ -183,6 +211,11 @@
width: 120,
},
{
+ label: "澶囨敞",
+ prop: "remark",
+ width: 120,
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
@@ -192,6 +225,7 @@
{
name: "宸ヨ壓璺嚎",
type: "text",
+ showHide: row => row.processRouteCode,
clickFun: row => {
showRouteItemModal(row);
},
@@ -375,6 +409,7 @@
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
model: data.model || "",
+ materialCode: data.materialCode || "",
bomNo: data.bomNo || "",
description: data.description || "",
orderId,
@@ -395,8 +430,24 @@
bomNo: row.bomNo || "",
productName: row.productCategory || "",
productModelName: row.specificationModel || "",
+ materialCode: row.materialCode || "",
orderId: row.id,
type: "order",
+ },
+ });
+ };
+
+ const goProductionDetail = (row) => {
+ if (!row) return;
+ router.push({
+ path: "/productionManagement/productionOrder/detail",
+ query: {
+ orderId: row.id,
+ npsNo: row.npsNo || "",
+ batchNo: row.batchNo || "",
+ productCategory: row.productCategory || "",
+ specificationModel: row.specificationModel || "",
+ materialCode: row.materialCode || "",
},
});
};
@@ -470,4 +521,8 @@
::v-deep .purple{
background-color: #F4DEFA;
}
+.progress-link {
+ cursor: pointer;
+}
+
</style>
--
Gitblit v1.9.3