更新

qd/src/api/acs/task/task.js

@@ -48,6 +48,14 @@ export function errorFinish(task_id) {
   })
 }
 
+export function noTargetPutFinish(task_id) {
+  return request({
+    url: 'api/task/noTargetPutFinish/' + task_id,
+    method: 'post',
+    data: task_id
+  })
+}
+
 export function exceptions(task_id) {
   return request({
     url: 'api/task/exception/' + task_id,
@@ -119,5 +127,5 @@ export function specialTaskCreate(data) {
   })
 }
 
-export default { add, edit, del, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst, reload, errorFinish, exceptions, deprecate }
+export default { add, edit, del, noTargetPutFinish, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst, reload, errorFinish, exceptions, deprecate }
 

qd/src/views/acs/task/index.vue

@@ -271,6 +271,7 @@
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">异常完成</el-dropdown-item>
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">异常</el-dropdown-item>
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'f')">作废</el-dropdown-item>
+                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'g')">非终点任务完成</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -467,6 +468,14 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    noTargetPutFinish(index, row) {
+      crudTask.noTargetPutFinish(row.task_id).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
     reload() {
       crudTask.reload().then(res => {
         this.crud.toQuery()
@@ -502,6 +511,9 @@ export default {
         case 'f':// 作废
           this.deprecate(command.index, command.row)
           break
+        case 'g':// 作废
+          this.noTargetPutFinish(command.index, command.row)
+          break
       }
     },
     showStartStorage(val) {