From aa855938843337dbaefc35fec42358b6a28b0767 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Mon, 28 Mar 2022 13:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderManage/00A.js               |  4 ++--
 src/router/index.js                      |  1 -
 src/views/QualityManager/scrap/index.vue | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/api/orderManage/00A.js b/src/api/orderManage/00A.js
index a0c93df..9f534b7 100644
--- a/src/api/orderManage/00A.js
+++ b/src/api/orderManage/00A.js
@@ -2,13 +2,13 @@
  * @Author: zwq
  * @Date: 2022-01-17 14:55:09
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:13:22
+ * @LastEditTime: 2022-03-28 13:52:12
  * @Description:
  */
 
 import request from '@/utils/request'
 
-export function ProcessInfoList(data) { // 获取工单工艺列表
+export function ProcessInfoList(data) { // 获取工单列表
   return request({
     url: '/api/wms/work/order/page',
     method: 'post',
diff --git a/src/router/index.js b/src/router/index.js
index 3b1655e..2a18a46 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -518,7 +518,6 @@ export const constantRoutes = [
         path: 'menumanager',
         component: () => import('@/views/MenuManager'),
         name: 'MenuManager',
-        hidden: true,
         meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {
diff --git a/src/views/QualityManager/scrap/index.vue b/src/views/QualityManager/scrap/index.vue
index 6b90dea..4c44d87 100644
--- a/src/views/QualityManager/scrap/index.vue
+++ b/src/views/QualityManager/scrap/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:54:40
+ * @LastEditTime: 2022-03-28 13:52:30
  * @Description:
 -->
 <template>
@@ -37,8 +37,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
-        <el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
+      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
+        <el-select v-model="formData.workOrderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
           <el-option
             v-for="(item, index) in orderList"
             :key="index"
@@ -88,7 +88,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 import { getEqList } from '@/api/equipment/maintain'
-import { ExecutionInfoList } from '@/api/orderManage/00A'
+import { ProcessInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -182,7 +182,7 @@ export default {
       formData: {
         timeSlot: null,
         substrateId: '',
-        orderId: '',
+        workOrderId: '',
         equipmentId: '',
         current: 1,
         size: 10,
@@ -254,7 +254,7 @@ export default {
       if (result1.code === 0) {
         this.device = result1.data.records
       }
-      const result2 = await ExecutionInfoList({
+      const result2 = await ProcessInfoList({
         current: 1,
         size: 999
       })