From 195770f92f7d739ffba6447fdbf3a3d5b9e009fa Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 24 四月 2026 16:32:57 +0800
Subject: [PATCH] fix(生产订单): 修复绑定工艺路线时的材料规格验证和显示问题
---
src/views/productionManagement/productionOrder/index.vue | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 15e7cba..0ad9ba4 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -94,7 +94,6 @@
import { listMain as getOrderProcessRouteMain } from "@/api/productionManagement/productProcessRoute.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import BindRouteDialog from "./BindRouteDialog.vue";
- import {getDeviceLedger} from "@/api/equipmentManagement/ledger.js";
const NewProductOrder = defineAsyncComponent(() => import("@/views/productionManagement/productionOrder/New.vue"));
const { proxy } = getCurrentInstance();
@@ -110,7 +109,13 @@
const handleBindRouteSubmit =async (data)=>{
const res = await saveProductionProductInput(data)
- console.log(res)
+ if(res.code === 200){
+ proxy.$modal.msgSuccess("缁戝畾鎴愬姛");
+ bindRouteDialogVisible.value = false
+ handleQuery()
+ }else{
+ proxy.$modal.msgError(res.msg || "缁戝畾澶辫触")
+ }
}
@@ -126,7 +131,7 @@
width: '150px',
},
{
- label: "瀹㈡埛鍚嶇О",
+ label: "鍘傚",
prop: "customerName",
width: '200px',
},
@@ -136,7 +141,7 @@
width: '120px',
},
{
- label: "瑙勬牸",
+ label: "绾稿紶瑙勬牸",
prop: "specificationModel",
width: '120px',
},
@@ -146,8 +151,28 @@
width: '200px',
},
{
- label: "闇�姹傛暟閲�",
+ label: "鍗板埛鏁伴噺",
prop: "quantity",
+ },
+ {
+ label: "灏哄",
+ prop: "cutSize",
+ width: '120px',
+ },
+ {
+ label: "灏忕洅鏁伴噺",
+ prop: "smallBoxQty",
+ width: '120px',
+ },
+ {
+ label: "涓洅鏁伴噺",
+ prop: "mediumBoxQty",
+ width: '120px',
+ },
+ {
+ label: "鑹叉暟",
+ prop: "printColorCount",
+ width: '120px',
},
{
label: "瀹屾垚鏁伴噺",
@@ -173,9 +198,14 @@
width: 120,
},
{
- label: "浜や粯鏃ユ湡",
+ label: "璁″垝浜よ揣鏃ユ湡",
prop: "deliveryDate",
formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
+ width: 120,
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
width: 120,
},
{
@@ -279,18 +309,25 @@
const openBindRouteDialog = async (row,type) => {
bindForm.orderId = row.id;
bindForm.routeId = null;
- bindRouteDialogVisible.value = true;
routeOptions.value = [];
bindRouteLoading.value = true;
- if(type === "view") {
- bindDialogType.value = "view"
- let res = await viewGetByProductWordId(row.id)
- console.log(res)
- }
- BindRouteDialogRef.value?.getProductOrder()
-
try {
- rowData.value = row;
+ BindRouteDialogRef.value?.resetForm?.()
+ if (type === "view") {
+ bindDialogType.value = "detail"
+ const res = await viewGetByProductWordId(row.id)
+ if(res?.cuttingFileVo?.id ==null){
+ res.cuttingFileVo = []
+ }else{
+ res.cuttingFileVo = [res.cuttingFileVo]
+ }
+ rowData.value = res?.data || res
+ } else {
+ bindDialogType.value = "add"
+ rowData.value = row
+ rowData.value.finishedSize = row.specificationModel
+ }
+ bindRouteDialogVisible.value = true;
} catch (e) {
console.error("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触锛�", e);
proxy.$modal.msgError("鑾峰彇宸ヨ壓璺嚎鍒楄〃澶辫触");
--
Gitblit v1.9.3