立讯优化

qd/src/api/acs/instruction/instruction.js

@@ -63,4 +63,20 @@ export function reload() {
   })
 }
 
-export default { add, edit, del, finish, cancel, queryUnFinish, queryByTaskId,reload }
+export function getFinish(instruction_id) {
+  return request({
+    url: 'api/instruction/getFinish/' + instruction_id,
+    method: 'post',
+    data: instruction_id
+  })
+}
+
+export function putFinish(instruction_id) {
+  return request({
+    url: 'api/instruction/putFinish/' + instruction_id,
+    method: 'post',
+    data: instruction_id
+  })
+}
+
+export default { add, edit, del, finish, cancel, queryUnFinish, queryByTaskId, reload, getFinish, putFinish }

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

@@ -125,6 +125,12 @@
             <span v-if="scope.row.send_status=='2' ">失败</span>
           </template>
         </el-table-column>
+        <el-table-column prop="finish_type" label="完成类型">
+          <template slot-scope="scope">
+            <span v-if="scope.row.finish_type=='1' ">取货完成</span>
+            <span v-if="scope.row.finish_type=='2' ">放货完成</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="start_point_code" label="起点" />
         <el-table-column prop="start_parent_code" label="父起点点位" />
         <el-table-column prop="next_point_code" label="终点" />
@@ -159,6 +165,8 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>
+                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">取货完成</el-dropdown-item>
+                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">放货完成</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -173,6 +181,7 @@
 import crudInstruction from '@/api/acs/instruction/instruction'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/api/system/dict'
 import crudTask from '@/api/acs/task/task'
 
@@ -215,7 +224,8 @@ const defaultForm = {
 export default {
   dicts: ['task_status'],
   name: 'Instruction',
-  components: { crudOperation },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -228,6 +238,7 @@ export default {
         add: false,
         edit: true,
         del: true
+        // reset: true
       }
     })
   },
@@ -290,6 +301,22 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    getFinish(index, row) {
+      crudInstruction.getFinish(row.instruction_id).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    putFinish(index, row) {
+      crudInstruction.putFinish(row.instruction_id).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
     reload() {
       crudInstruction.reload().then(res => {
         this.crud.toQuery()
@@ -313,6 +340,12 @@ export default {
         case 'b':// 取消
           this.cancel(command.index, command.row)
           break
+        case 'c':// 取消
+          this.getFinish(command.index, command.row)
+          break
+        case 'd':// 取消
+          this.putFinish(command.index, command.row)
+          break
       }
     }
 

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

@@ -55,6 +55,7 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
+        <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -283,6 +284,7 @@
 import crudTask from '@/api/acs/task/task'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import deviceCrud from '@/api/acs/device/device'
 import routeCurd from '@/api/acs/route/routePlan'
@@ -310,11 +312,18 @@ const defaultForm = {
 }
 export default {
   name: 'Task',
-  components: { pagination, crudOperation },
+  components: { pagination, crudOperation, rrOperation },
   dicts: ['task_status', 'task_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask }})
+    return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask },
+      optShow: {
+        add: true,
+        edit: true,
+        del: true
+        // reset: true
+      }
+    })
   },
   data() {
     const checkFromY = (rule, value, callback) => {