From ddcae6d1196d4f2c311de207cdd8cd51d4900498 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Fri, 11 Mar 2022 09:20:02 +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/menu.js                                | 18 +++++++++---------
 src/lang/i18n/en/module/basicData.js           |  7 +------
 src/lang/i18n/zh/module/basicData.js           |  8 +-------
 .../components/ExecutionInfoDetail.vue         | 14 +++++++++++++-
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/api/menu.js b/src/api/menu.js
index 16b6cb6..46817cd 100644
--- a/src/api/menu.js
+++ b/src/api/menu.js
@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-28 20:46:53
  * @LastEditors: zwq
- * @LastEditTime: 2021-04-25 14:52:11
+ * @LastEditTime: 2022-03-11 09:16:13
  * @FilePath: \basic-admin\src\api\menu.js
  * @Description: 菜单api接口定义
  */
@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // 获取菜单列表
 export function getMenuList(data) {
   return request({
-    url: '/upms/menu/list',
+    url: '/api/upms/menu/list',
     method: 'post',
     data
   })
@@ -19,7 +19,7 @@ export function getMenuList(data) {
 // 获取菜单详情
 export function getMenuDetail(id) {
   return request({
-    url: '/upms/menu/get',
+    url: '/api/upms/menu/get',
     method: 'post',
     data: { id }
   })
@@ -28,7 +28,7 @@ export function getMenuDetail(id) {
 // 新增菜单
 export function addMenu(data) {
   return request({
-    url: '/upms/menu/add',
+    url: '/api/upms/menu/add',
     method: 'post',
     data
   })
@@ -37,7 +37,7 @@ export function addMenu(data) {
 // 删除菜单
 export function delMenu(id) {
   return request({
-    url: '/upms/menu/delete',
+    url: '/api/upms/menu/delete',
     method: 'post',
     data: { id }
   })
@@ -46,7 +46,7 @@ export function delMenu(id) {
 // 启停菜单
 export function enableMenu(data) {
   return request({
-    url: '/upms/menu/enabled',
+    url: '/api/upms/menu/enabled',
     method: 'post',
     data
   })
@@ -55,7 +55,7 @@ export function enableMenu(data) {
 // 修改菜单
 export function editMenu(data) {
   return request({
-    url: '/upms/menu/update',
+    url: '/api/upms/menu/update',
     method: 'post',
     data
   })
@@ -64,7 +64,7 @@ export function editMenu(data) {
 // 菜单-角色关联授权
 export function saveRoleMenu(data) {
   return request({
-    url: '/upms/menu/saveRoleMenu',
+    url: '/api/upms/menu/saveRoleMenu',
     method: 'post',
     data
   })
@@ -73,7 +73,7 @@ export function saveRoleMenu(data) {
 // 菜单-角色关联获取
 export function listByRole(id) {
   return request({
-    url: '/upms/menu/listByRole',
+    url: '/api/upms/menu/listByRole',
     method: 'post',
     data: { id }
   })
diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index 391b68f..ae4cedb 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 14:05:21
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:56
->>>>>>> develop
+ * @LastEditTime: 2022-03-11 08:28:27
  * @Description: file content
  */
 export default {
diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 4b94bc2..14a5168 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,14 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 14:05:01
- * @Description: file content
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:50
->>>>>>> develop
+ * @LastEditTime: 2022-03-11 08:28:40
  */
 export default {
   visual: {
diff --git a/src/views/orderManage/components/ExecutionInfoDetail.vue b/src/views/orderManage/components/ExecutionInfoDetail.vue
index 71c7470..dc275af 100644
--- a/src/views/orderManage/components/ExecutionInfoDetail.vue
+++ b/src/views/orderManage/components/ExecutionInfoDetail.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:43:01
+ * @LastEditTime: 2022-03-11 09:05:38
  * @Description:
 -->
 <template>
@@ -40,6 +40,11 @@
                 <el-input v-model="dataForm.priority" :placeholder="$t('module.basicData.Warehouse.Priority')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.CompletionTime')" prop="finishProduceTime">
+                <el-input v-model="dataForm.finishProduceTime" :placeholder="$t('module.basicData.Warehouse.CompletionTime')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
         <el-col :span="8">
@@ -64,6 +69,11 @@
                 <el-input v-model="dataForm.triggerOrigin" :placeholder="$t('module.basicData.Warehouse.triggerOrigin')" readonly :style="{width: '100%'}" />
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('module.basicData.Warehouse.ProcessOrNot')" prop="ProcessOrNot">
+                <el-input v-model="dataForm.ProcessOrNot" :placeholder="$t('module.basicData.Warehouse.ProcessOrNot')" readonly :style="{width: '100%'}" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
         <el-col :span="8">
@@ -117,6 +127,7 @@ export default {
         priority: '',
         actualQuantity: '',
         startProduceTime: '',
+        finishProduceTime: '',
         scrapQuantity: '',
         triggerOrigin: '',
         type: '',
@@ -140,6 +151,7 @@ export default {
             res.data.type = this.statusfilter('orderType', res.data.type)
             res.data.priority = this.statusfilter('priority', res.data.priority)
             res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
+            res.data.ProcessOrNot = res.data.processId ? '是' : '否'
             this.dataForm = res.data
           })
         }
-- 
2.45.2