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

add:增加7月份的一些新增需求实现；

Browse Source
This commit is contained in:
gongbaoxiong
2026-07-30 11:13:11 +08:00
parent 45e7b12dbd
commit cac00113a3
25 changed files with 731 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-ui/src/i18n/langs/instruction/zh.js
View File

@@ -25,6 +25,7 @@ export default {
'task_status': '任务状态',
'input_startCode_or_nextCode': '输入起点或终点',
'ready': '就绪',
'finished_move': '取货完成',
'Execution': '执行中',
'Finish': '完成',
'undelivered': '未下发',

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

@@ -146,13 +146,13 @@
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.instruction_status=='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.instruction_status=='2' ">{{ $t('task.select.Completed') }}</span>
<span v-if="scope.row.instruction_status=='3' ">{{ $t('task.select.Cancel') }}</span>
<span v-if="scope.row.instruction_status=='4' ">{{ $t('task.select.finished_move') }}</span>
<span v-if="scope.row.instruction_status=='8' ">{{ $t('task.select.assign') }}</span>
<span v-if="scope.row.instruction_status=='10' ">{{ $t('task.select.request') }}</span>
<span v-if="scope.row.instruction_status==='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.instruction_status==='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.instruction_status==='1.1' ">{{ $t('Inst.table.finished_move') }}</span>
<span v-if="scope.row.instruction_status==='2' ">{{ $t('task.select.Completed') }}</span>
<span v-if="scope.row.instruction_status==='3' ">{{ $t('task.select.Cancel') }}</span>
<span v-if="scope.row.instruction_status==='8' ">{{ $t('task.select.assign') }}</span>
<span v-if="scope.row.instruction_status==='10' ">{{ $t('task.select.request') }}</span>
</template>
</el-table-column>
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />

7
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -157,9 +157,10 @@
<el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
<el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
<span v-if="scope.row.instruction_status=='1' ">{{ $t('Inst.table.Execution') }}</span>
<span v-if="scope.row.instruction_status=='2' ">{{ $t('Inst.table.Finish') }}</span>
<span v-if="scope.row.instruction_status==='0' ">{{ $t('Inst.table.ready') }}</span>
<span v-if="scope.row.instruction_status==='1' ">{{ $t('Inst.table.Execution') }}</span>
<span v-if="scope.row.instruction_status==='1.1' ">{{ $t('Inst.table.finished_move') }}</span>
<span v-if="scope.row.instruction_status==='2' ">{{ $t('Inst.table.Finish') }}</span>
</template>
</el-table-column>
<el-table-column prop="send_status" :label="$t('Inst.table.send_status')" :min-width="flexWidth('send_status',crud.data,$t('Inst.table.send_status'))">

2
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -578,7 +578,7 @@
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
</el-table-column>
</el-table-column>.
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
<el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />