From 511c09e02361dfd72837fc36e77422be81a2e5dd Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 26 Feb 2024 16:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=20=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

生产计划 菜单 打印
---
 .../mes-ui-admin-vue3/src/views/heli/plan/index.vue  |  6 +++---
 .../src/views/heli/plan/productionPrint.vue          | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
index 6d290bf0..042f5f32 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
@@ -239,15 +239,15 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const openForm = (id: number) => {
-  router.push({ path: '/plan/edit', query: { id: id } })
+  router.push({ path: '/plan/planedit', query: { id: id } })
 }
 const openAdd = (id: number) => {
-  router.push({ path: '/plan/add' })
+  router.push({ path: '/plan/planadd' })
 }
 
 /** 添加/修改操作 */
 const openDetail = (id: number) => {
-  router.push({ path: '/plan/detail', query: { id: id } })
+  router.push({ path: '/plan/plandetail', query: { id: id } })
 }
 
 /** 导出按钮操作 */
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
index 88828dac..0667e5ff 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
@@ -220,9 +220,9 @@
             <td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
           </tr>
            <tr>
-            <td colspan="4">{{formData.creatorName}}</td>
-            <td colspan="3">{{formData.auditUserName}}</td>
-            <td colspan="3">{{formData.approveUserName}}</td>
+            <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
           </tr>
         </tbody>
       </table>
@@ -374,9 +374,9 @@
               <td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
             </tr>
              <tr>
-              <td colspan="4">{{formData.creatorName}}</td>
-              <td colspan="3">{{formData.auditUserName}}</td>
-              <td colspan="3">{{formData.approveUserName}}</td>
+              <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
             </tr>
           </tbody>
         </table>