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

rev:增加任务校验

Browse Source
This commit is contained in:
tuqiang
2025-11-05 09:20:25 +08:00
parent 5209aca9a9
commit 257b512bea
14 changed files with 158 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-ui/src/i18n/langs/task/en.js
View File

@@ -48,6 +48,7 @@ export default {
'Pickup_point': 'Pickup Point',
'Delivery_point': 'Delivery Point',
'Remark': 'Remark',
'Car_no': 'Car_no',
'Creator': 'Creator',
'Create_time': 'Creation Time',
'Operation': 'Operation',

1
acs2/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -48,6 +48,7 @@ export default {
'Pickup_point': 'Titik Pengambilan',
'Delivery_point': 'Titik Pengiriman',
'Remark': 'Catatan',
'Car_no': 'Car_no',
'Creator': 'Pencipta',
'Create_time': 'Waktu Penciptaan',
'Operation': 'Operasi',

1
acs2/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -50,6 +50,7 @@ export default {
'Pickup_point': '取货点',
'Delivery_point': '放货点',
'Remark': '备注',
'Car_no': '车号',
'Creator': '创建者',
'Create_time': '创建时间',
'Operation': '操作',

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

@@ -168,8 +168,13 @@
:min-width="flexWidth('start_point_code2',crud.data,$t('Inst.table.start_point_code2'))"/>
<el-table-column prop="next_point_code2" :label="$t('Inst.table.next_point_code2')"
:min-width="flexWidth('next_point_code2',crud.data,$t('Inst.table.next_point_code2'))"/>
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')"
:min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))"/>
<el-table-column prop="execute_code" label="取货状态"
:min-width="flexWidth('execute_code',crud.data,'取货状态')">
<template slot-scope="scope">
<span v-if="scope.row.execute_code=='0' ">{{ "未取货" }}</span>
<span v-if="scope.row.execute_code=='1' ">{{ "取货完成" }}</span>
</template>
</el-table-column>
<el-table-column prop="carno" :label="$t('Inst.table.carno')"
:min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))"/>
<el-table-column prop="remark" :label="$t('Inst.table.remark')"
@@ -185,7 +190,7 @@
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
:label="$t('auto.common.Operate')"
width="200"
width="130"
align="center"
fixed="right"
>
@@ -200,9 +205,9 @@
<el-button type="text" icon="el-icon-circle-close" @click="handleCommand(scope.$index, scope.row,'b')">
{{ $t('auto.common.Cancel') }}
</el-button>
<el-button type="text" icon="el-icon-error" @click="handleCommand(scope.$index, scope.row,'c')">
{{ $t('auto.common.Forced_cancellation') }}
</el-button>
<!-- <el-button type="text" icon="el-icon-error" @click="handleCommand(scope.$index, scope.row,'c')">-->
<!-- {{ $t('auto.common.Forced_cancellation') }}-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>

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

@@ -457,6 +457,15 @@
/>
<el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')"
:min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))"/>
<el-table-column prop="car_no" :label="$t('task.select.Car_no')"
:min-width="flexWidth('car_no',crud.data,$t('task.select.Car_no'))"/>
<el-table-column prop="execute_code" label="取货状态"
:min-width="flexWidth('execute_code',crud.data,'取货状态')">
<template slot-scope="scope">
<span v-if="scope.row.execute_code === null || scope.row.execute_code === ''">{{ "未取货" }}</span>
<span v-if="scope.row.execute_code==='1' ">{{ "取货完成" }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" :label="$t('task.select.Remark')"
:min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))"/>
<el-table-column prop="create_by" :label="$t('task.select.Creator')"
@@ -468,7 +477,7 @@
<el-table-column prop="update_time" :label="$t('Inst.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))"/>
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')"
width="250" align="center" fixed="right">
width="200" align="center" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@@ -483,12 +492,12 @@
<el-button type="text" icon="el-icon-folder-add" @click="handleCommand(scope.$index, scope.row,'c')">
{{ $t('task.select.Create_command') }}
</el-button>
<el-button type="text" icon="el-icon-finished" @click="handleCommand(scope.$index, scope.row,'d')">
{{ $t('task.select.Forced_Completed') }}
</el-button>
<el-button type="text" icon="el-icon-circle-close" @click="handleCommand(scope.$index, scope.row,'e')">
{{ $t('task.select.Cancel_Tasks_And_Commands') }}
</el-button>
<!-- <el-button type="text" icon="el-icon-finished" @click="handleCommand(scope.$index, scope.row,'d')">-->
<!-- {{ $t('task.select.Forced_Completed') }}-->
<!-- </el-button>-->
<!-- <el-button type="text" icon="el-icon-circle-close" @click="handleCommand(scope.$index, scope.row,'e')">-->
<!-- {{ $t('task.select.Cancel_Tasks_And_Commands') }}-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@@ -610,6 +619,7 @@ export default {
empty_site: '',
task_status: null,
priority: 1,
execute_code: null,
start_point_code: null,
start_point_code2: null,
start_device_code: null,