国际化菜单

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)
       }
     },
     /** 导出按钮操作 */

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 {