盘点流程测试

ruoyi-ui/src/views/check/job/in/index.vue

@@ -215,8 +215,8 @@
             icon="el-icon-delete"
             size="mini"
             :disabled="multiple"
-            @click="handleManualVoid"
-            v-hasPermi="['job:checkMydoJob:manualInvalidation']"
+            @click="handleCompletedManually({type: 'invalid'})"
+            v-hasPermi="['job:mydoJob:manualInvalidation']"
           >{{$t('checkJobIn.manualVoid')}}</el-button> <!--手动作废-->
         </el-col>
         <el-col :span="1.5">
@@ -226,8 +226,8 @@
             icon="el-icon-edit"
             size="mini"
             :disabled="multiple"
-            @click="handleManualFinish"
-            v-hasPermi="['job:checkMydoJob:manualCompleted']"
+            @click="handleCompletedManually({type: 'completed'})"
+            v-hasPermi="['job:mydoJob:manualCompleted']"
           >{{$t('checkJobIn.manualFinish')}}</el-button> <!--手动完成-->
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -336,7 +336,15 @@
 </template>
 
 <script>
-import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/inmydoJob"
+import {
+  listMydoJob,
+  getMydoJob,
+  delMydoJob,
+  addMydoJob,
+  updateMydoJob,
+  manualInvalidation,
+  manualCompleted
+} from "@/api/job/inmydoJob"
 import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
 
 export default {
@@ -506,15 +514,29 @@ export default {
 
     // 手动完成/作废
     handleCompletedManually(row) {
+      console.log("1111")
       const jobIds = this.ids;
       if (jobIds.length === 0) {
-        this.$modal.msgError(this.$t('checkJobIn.selectData'));
+        this.$modal.msgError("请选择要操作的数据");
         return;
       }
+      if (jobIds.length > 1) {
+        this.$modal.msgError("请选择一条任务");
+        return;
+      }
+      var data = {
+        "jobId":  jobIds[0],
+      }
       if (row.type === 'invalid'){
         //手动作废
+        manualInvalidation(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+        })
       }else if (row.type === 'completed'){
         //手动完成
+        manualCompleted(data).then(response => {
+          this.$modal.msgSuccess("操作成功");
+        })
       }
     },
     /** 导出按钮操作 */