From 71a9eef518f2f2f1a1eb2fb90f2eb8ab7b155bc8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 一月 2026 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/views/productionManagement/workOrder/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index a538c1d..acc3cd1 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -61,9 +61,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
@click="handleUpdate">纭畾</el-button>
+ <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
</el-dialog>
@@ -184,9 +184,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
@click="handleReport">纭畾</el-button>
+ <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
</el-dialog>
@@ -214,6 +214,11 @@
width: "140",
},
{
+ label: "鐢熶骇璁㈠崟鍙�",
+ prop: "productOrderNpsNo",
+ width: "140",
+ },
+ {
label: "浜у搧鍚嶇О",
prop: "productName",
width: "140",
--
Gitblit v1.9.3