From 960fbcb3fb41034ab6d06a5608f7a40143f828b6 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 26 May 2025 13:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/job/mydoJob.js             | 16 ++++++++++++++++
 ruoyi-ui/src/lang/en.js                     |  8 +++++++-
 ruoyi-ui/src/lang/zh.js                     | 10 +++++++++-
 ruoyi-ui/src/store/modules/permission.js    |  7 +++++++
 ruoyi-ui/src/views/in/job/index.vue         | 17 ++++++++++++++++-
 ruoyi-ui/src/views/in/receive/add/index.vue |  3 ++-
 6 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/api/job/mydoJob.js b/ruoyi-ui/src/api/job/mydoJob.js
index 962a6e0..39a4006 100644
--- a/ruoyi-ui/src/api/job/mydoJob.js
+++ b/ruoyi-ui/src/api/job/mydoJob.js
@@ -42,3 +42,19 @@ export function delMydoJob(jobId) {
     method: 'delete'
   })
 }
+// 手动完成
+export function manualCompleted(data) {
+  return request({
+    url: '/job/mydoJob/manualCompleted',
+    method: 'post',
+    data: data
+  })
+}
+//手动作废
+export function manualInvalidation(data) {
+  return request({
+    url: '/job/mydoJob/manualInvalidation',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index 4ebc50a..7b28737 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -66,6 +66,12 @@ export default {
     selectProduct: 'Select Product'
   },
   menu: {
-    InboundManagement: 'InboundManagement'
+
+    //收货单据新增
+    InboundManagement: 'InboundManagement',
+    ReceivingDocumentsAdd:"ReceivingDocumentsAdd",
+    ReceiptDocumentManagement:"ReceiptDocumentManagement",
+    ManagementOfInboundDocuments:"ManagementOfInboundDocuments",
+    InboundTaskManagement:"InboundTaskManagement",
   },
 }
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index d6e1d12..7dada00 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -63,5 +63,13 @@ export default {
     totalAmount: '总金额',
     submit: '提交',
     selectProduct: '选择物料'
-  }
+  },
+  menu: {
+    InboundManagement:"入库管理",
+    //收货单据新增
+    ReceivingDocumentsAdd: '收货单据新增',
+    ReceiptDocumentManagement:"收货单据管理",
+    ManagementOfInboundDocuments:"入库单据管理",
+    InboundTaskManagement:"入库作业管理",
+  },
 }
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index b549ef0..b78a8d9 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -4,6 +4,7 @@ import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView'
 import InnerLink from '@/layout/components/InnerLink'
+import i18n from "@/lang";
 
 const permission = {
   state: {
@@ -46,6 +47,8 @@ const permission = {
           commit('SET_DEFAULT_ROUTES', sidebarRoutes)
           commit('SET_TOPBAR_ROUTES', sidebarRoutes)
           resolve(rewriteRoutes)
+
+
         })
       })
     }
@@ -69,6 +72,10 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
       } else {
         route.component = loadView(route.component)
       }
+      // 在 route.component 处理后添加
+      if (route.meta && route.meta.title) {
+        route.meta.title = i18n.t(route.meta.title)
+      }
     }
     if (route.children != null && route.children && route.children.length) {
       route.children = filterAsyncRouter(route.children, route, type)
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 0669100..0a258d3 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -214,6 +214,7 @@
           plain
           icon="el-icon-edit"
           size="mini"
+          :disabled=single
           @click="handleCompletedManually({type: 'invalid'})"
           v-hasPermi="['job:mydoJob:CompletedManually']"
         >手动作废</el-button>
@@ -224,6 +225,7 @@
           plain
           icon="el-icon-edit"
           size="mini"
+          :disabled=single
           @click="handleCompletedManually({type: 'completed'})"
           v-hasPermi="['job:mydoJob:CompletedManually']"
         >手动完成</el-button>
@@ -352,7 +354,15 @@
 </template>
 
 <script>
-import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/mydoJob"
+import {
+  listMydoJob,
+  getMydoJob,
+  delMydoJob,
+  addMydoJob,
+  updateMydoJob,
+  manualCompleted,
+  manualInvalidation,
+} from "@/api/job/mydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
 
 export default {
@@ -525,8 +535,13 @@ export default {
       }
       if (row.type === 'invalid'){
         //手动作废
+        manualInvalidation(data)
       }else if (row.type === 'completed'){
+        var data = {
+          jobId: jobIds
+        }
         //手动完成
+        manualCompleted(data)
       }
     },
     /** 导出按钮操作 */
diff --git a/ruoyi-ui/src/views/in/receive/add/index.vue b/ruoyi-ui/src/views/in/receive/add/index.vue
index 2298d69..77a1eb1 100644
--- a/ruoyi-ui/src/views/in/receive/add/index.vue
+++ b/ruoyi-ui/src/views/in/receive/add/index.vue
@@ -120,7 +120,7 @@
               icon="el-icon-delete"
               @click="handleDeleteProduct(scope.$index)"
             >{{ $t('receiveStockinAdd.delete') }}</el-button>
-            
+
           </template>
         </el-table-column>
       </el-table>
@@ -193,6 +193,7 @@ import {addStockin} from "@/api/receive/stockin";
 import {listBasProduct} from "@/api/bas/BasProduct";
 import {listBasSupplier} from "@/api/bas/BasSupplier";
 import { getToken } from "@/utils/auth"
+import {listWarehouse} from "";
 
 
 export default {