root/weiDaQi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.0xFF同时删除任务并上送wms，与wms保持状态一致

Browse Source 
2.如果指令已完成或取消，不再次查询导致任务状态被覆盖
3.界面优化历史查询增加状态3取消
This commit is contained in:
pangshenghao
2023-06-16 16:12:37 +08:00
parent 6e5cd4cc36
commit d2f3951477
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
View File

@@ -104,6 +104,7 @@
<span v-if="scope.row.instruction_status=='0' ">就绪</span>
<span v-if="scope.row.instruction_status=='1' ">执行中</span>
<span v-if="scope.row.instruction_status=='2' ">完成</span>
<span v-if="scope.row.instruction_status=='3' ">取消</span>
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起点" />

1
acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -237,6 +237,7 @@
<span v-if="scope.row.task_status=='0' ">就绪</span>
<span v-if="scope.row.task_status=='1' ">执行中</span>
<span v-if="scope.row.task_status=='2' ">完成</span>
<span v-if="scope.row.task_status=='3' ">取消</span>
</template>
</el-table-column>
<el-table-column prop="priority" label="任务优先级" />

1
acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -94,6 +94,7 @@
<span v-if="scope.row.task_status=='0' ">就绪</span>
<span v-if="scope.row.task_status=='1' ">执行中</span>
<span v-if="scope.row.task_status=='2' ">完成</span>
<span v-if="scope.row.task_status=='3' ">取消</span>
</template>
</el-table-column>
<el-table-column prop="priority" label="任务优先级" />