add: 历史记录模块实现国际化
This commit is contained in:
@@ -752,7 +752,8 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
|
||||
JSONArray array = json.getJSONArray("data");
|
||||
|
||||
if (array.size() == 0) {
|
||||
throw new RuntimeException("请选择起点");
|
||||
throw new BadRequestException( LangProcess.msg("starting_point_isNull"));
|
||||
//throw new RuntimeException("请选择起点");
|
||||
}
|
||||
for (int i = 0; i < array.size(); i++) {
|
||||
JSONObject arrjo = array.getJSONObject(i);
|
||||
|
||||
@@ -2,3 +2,4 @@ task_checkExist={0}任务已存在
|
||||
task_insHas=指令已存在
|
||||
task_insRun=有指令未完成
|
||||
task_isNull={0}查询信息不存在
|
||||
starting_point_isNull=请选择起点
|
||||
|
||||
@@ -2,3 +2,4 @@ task_checkExist=Task {0} already exists
|
||||
task_insHas=Instruction already exists
|
||||
task_insRun=There are instructions that are not completed
|
||||
task_isNull={0}query is null
|
||||
starting_point_isNull = Please select starting point
|
||||
|
||||
@@ -2,3 +2,4 @@ task_checkExist=Tugas {0} sudah ada
|
||||
task_insHas=Instruksi sudah ada
|
||||
task_insRun=Ada instruksi yang belum selesai
|
||||
task_isNull={0}Pertanyaan Tidak ada
|
||||
starting_point_isNull = Silakan pilih titik awal
|
||||
|
||||
@@ -4,6 +4,7 @@ import menu from './menu/zh'
|
||||
import param from './param/zh'
|
||||
import instruction from './instruction/zh'
|
||||
import task from './task/zh'
|
||||
import history from './history/zh'
|
||||
|
||||
export default {
|
||||
...zhLocale,
|
||||
@@ -11,5 +12,6 @@ export default {
|
||||
...menu,
|
||||
...param,
|
||||
...instruction,
|
||||
...task
|
||||
...task,
|
||||
...history
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import menu from './menu/en'
|
||||
import param from './param/en'
|
||||
import instruction from './instruction/en'
|
||||
import task from './task/en'
|
||||
import history from './history/en'
|
||||
|
||||
export default {
|
||||
...enLocale,
|
||||
@@ -11,5 +12,6 @@ export default {
|
||||
...menu,
|
||||
...param,
|
||||
...instruction,
|
||||
...task
|
||||
...task,
|
||||
...history
|
||||
}
|
||||
|
||||
24
acs/nladmin-ui/src/i18n/langs/history/en.js
Normal file
24
acs/nladmin-ui/src/i18n/langs/history/en.js
Normal file
@@ -0,0 +1,24 @@
|
||||
export default {
|
||||
'TaskRecord': {
|
||||
'table': {
|
||||
'Task_code': 'Input task number',
|
||||
'Vehicle_number': 'Input vehicle number',
|
||||
'Task_number': 'Task code(instruction code)',
|
||||
'Status': 'Status',
|
||||
'Priority': 'Task priority',
|
||||
'Starting_point_two': 'Starting point two',
|
||||
'Endpoint_two': 'Endpoint Two',
|
||||
'Material': 'Material',
|
||||
'Quantity': 'Quantity',
|
||||
'Numbering': 'Numbering',
|
||||
'Value': 'Value',
|
||||
'Input_task_instruction_number': 'Enter task number or instruction number',
|
||||
'Instruction_code': 'Instruction code',
|
||||
'Instruction_status': 'Instruction_status',
|
||||
'Update_by': 'Modifier',
|
||||
'Update_time': 'Modification time'
|
||||
},
|
||||
'rules': {
|
||||
}
|
||||
}
|
||||
}
|
||||
24
acs/nladmin-ui/src/i18n/langs/history/in.js
Normal file
24
acs/nladmin-ui/src/i18n/langs/history/in.js
Normal file
@@ -0,0 +1,24 @@
|
||||
export default {
|
||||
'TaskRecord': {
|
||||
'table': {
|
||||
'Task_code': 'Input nomor tugas',
|
||||
'Vehicle_number': 'Input nomor kendaraan',
|
||||
'Task_number': 'Nomor tugas(kode instruksi)',
|
||||
'Status': 'Status',
|
||||
'Priority': 'Prioritas tugas',
|
||||
'Starting_point_two': 'Titik awalan dua',
|
||||
'Endpoint_two': 'Titik akhir dua',
|
||||
'Material': 'Bahan',
|
||||
'Quantity': 'Jumlah',
|
||||
'Numbering': 'Nomor',
|
||||
'Value': 'Nilai',
|
||||
'Input_task_instruction_number': 'Masukkan nomor tugas atau nomor instruksi',
|
||||
'Instruction_code': 'Kode instruksi',
|
||||
'Instruction_status': 'Status instruksi',
|
||||
'Update_by': 'Pengubah',
|
||||
'Update_time': 'Waktu modifikasi'
|
||||
},
|
||||
'rules': {
|
||||
}
|
||||
}
|
||||
}
|
||||
24
acs/nladmin-ui/src/i18n/langs/history/zh.js
Normal file
24
acs/nladmin-ui/src/i18n/langs/history/zh.js
Normal file
@@ -0,0 +1,24 @@
|
||||
export default {
|
||||
'TaskRecord': {
|
||||
'table': {
|
||||
'Task_code': '输入任务号',
|
||||
'Vehicle_number': '输入载具号',
|
||||
'Task_number': '任务号(指令编码)',
|
||||
'Status': '状态',
|
||||
'Priority': '任务优先级',
|
||||
'Starting_point_two': '起点2',
|
||||
'Endpoint_two': '终点2',
|
||||
'Material': '物料',
|
||||
'Quantity': '数量',
|
||||
'Numbering': '编号',
|
||||
'Value': '值',
|
||||
'Input_task_instruction_number': '输入任务号或指令号',
|
||||
'Instruction_code': '指令编码',
|
||||
'Instruction_status': '指令状态',
|
||||
'Update_by': '修改者',
|
||||
'Update_time': '修改时间'
|
||||
},
|
||||
'rules': {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import menu from './menu/in'
|
||||
import param from './param/in'
|
||||
import instruction from './instruction/in'
|
||||
import task from './task/in'
|
||||
import history from './history/in'
|
||||
|
||||
export default {
|
||||
...idLocale,
|
||||
@@ -11,5 +12,6 @@ export default {
|
||||
...menu,
|
||||
...param,
|
||||
...instruction,
|
||||
...task
|
||||
...task,
|
||||
...history
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ export default {
|
||||
'Routing_scheme': 'Routing scheme',
|
||||
'Priority': 'Priority',
|
||||
'Vehicle_number': 'Vehicle number',
|
||||
'Task_code': 'Task_code',
|
||||
'Task_code': 'Task code',
|
||||
'Task': 'Task'
|
||||
},
|
||||
'select': {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
v-model="query.code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入任务号或指令号"
|
||||
:placeholder="$t('TaskRecord.table.Input_task_instruction_number')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -17,7 +17,7 @@
|
||||
v-model="query.vehicle_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入载具号"
|
||||
:placeholder="$t('task.txt_box.Vehicle_registration_number')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -27,7 +27,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="物料类型"
|
||||
:placeholder="$t('task.txt_box.Material_type')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -39,7 +39,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="任务状态"
|
||||
:placeholder="$t('task.txt_box.Task_status')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -50,7 +50,7 @@
|
||||
v-model="query.point_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入起点或终点"
|
||||
:placeholder="$t('task.txt_box.Origin_or_destination')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -68,22 +68,22 @@
|
||||
width="500px"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
|
||||
<el-form-item label="起点">
|
||||
<el-form-item :label="$t('task.select.Start_point')">
|
||||
<el-input v-model="form.start_point_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="终点">
|
||||
<el-form-item :label="$t('task.select.Destination')">
|
||||
<el-input v-model="form.next_point_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具号">
|
||||
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述信息" prop="description">
|
||||
<el-form-item :label="$t('task.select.Description')" prop="description">
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
<el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
@@ -96,25 +96,25 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column v-if="false" prop="instruction_id" label="指令标识" />
|
||||
<el-table-column prop="instruction_code" label="指令编号" />
|
||||
<el-table-column prop="task_code" label="任务号" />
|
||||
<el-table-column prop="vehicle_code" label="载具号" />
|
||||
<el-table-column prop="instruction_status" label="指令状态">
|
||||
<el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" />
|
||||
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" />
|
||||
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
|
||||
<el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')">
|
||||
<template slot-scope="scope">
|
||||
<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=='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>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="start_point_code" label="起点" />
|
||||
<el-table-column prop="next_point_code" label="终点" />
|
||||
<el-table-column prop="matarial" label="物料" />
|
||||
<el-table-column prop="quantity" label="数量" />
|
||||
<el-table-column prop="remark" label="描述" />
|
||||
<el-table-column prop="create_by" label="创建者" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="135" />
|
||||
<el-table-column prop="update_by" label="修改者" />
|
||||
<el-table-column prop="update_time" label="修改时间" width="135" />
|
||||
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
|
||||
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
|
||||
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
|
||||
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
|
||||
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
|
||||
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
|
||||
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
|
||||
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" />
|
||||
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" width="135" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
v-model="query.task_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入任务号"
|
||||
:placeholder="$t('TaskRecord.table.Task_code')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -19,7 +19,7 @@
|
||||
value="1"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入任务号"
|
||||
:placeholder="$t('TaskRecord.table.Task_code')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -28,7 +28,7 @@
|
||||
v-model="query.vehicle_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入载具号"
|
||||
:placeholder="$t('TaskRecord.table.Vehicle_number')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -38,7 +38,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="物料类型"
|
||||
:placeholder="$t('task.txt_box.Material_type')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -50,7 +50,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="任务状态"
|
||||
:placeholder="$t('task.txt_box.Task_status')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -61,7 +61,7 @@
|
||||
v-model="query.point_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入起点或终点"
|
||||
:placeholder="$t('task.txt_box.Origin_or_destination')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -74,7 +74,7 @@
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:visible.sync="crud.status.cu"
|
||||
:title="crud.status.title"
|
||||
width="500px"
|
||||
>
|
||||
@@ -82,12 +82,12 @@
|
||||
<el-form-item v-if="false" label="任务标识" prop="task_id">
|
||||
<el-input v-model="form.task_id" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料类型">
|
||||
<el-form-item :label="$t('task.txt_box.Material_type')">
|
||||
<el-select
|
||||
v-model="form.material"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.material_type"
|
||||
@@ -102,7 +102,7 @@
|
||||
v-model="form.route_plan_code"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
default-first-option
|
||||
>
|
||||
<el-option
|
||||
@@ -113,12 +113,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="起点" prop="start_point_code">
|
||||
<el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
|
||||
<el-select
|
||||
v-model="form.start_point_code"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="showStartStorage"
|
||||
>
|
||||
<el-option
|
||||
@@ -129,12 +129,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="start_flag" label="起点-列" prop="from_y">
|
||||
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
|
||||
<el-select
|
||||
v-model="form.from_y"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fromYList"
|
||||
@@ -144,12 +144,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="start_flag" label="起点-层" prop="from_z">
|
||||
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_layer')" prop="from_z">
|
||||
<el-select
|
||||
v-model="form.from_z"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in fromZList"
|
||||
@@ -159,12 +159,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="终点" prop="next_point_code">
|
||||
<el-form-item :label="$t('task.select.Destination')" prop="next_point_code">
|
||||
<el-select
|
||||
v-model="form.next_point_code"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
@change="showEndStorage"
|
||||
>
|
||||
<el-option
|
||||
@@ -175,12 +175,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="end_flag" label="终点-列" prop="to_y">
|
||||
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y">
|
||||
<el-select
|
||||
v-model="form.to_y"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in toYList"
|
||||
@@ -190,12 +190,12 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="end_flag" label="终点-层" prop="to_z">
|
||||
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_layer')" prop="to_z">
|
||||
<el-select
|
||||
v-model="form.to_z"
|
||||
style="width: 370px;"
|
||||
filterable
|
||||
placeholder="请选择"
|
||||
:placeholder="$t('task.select.Placeholder')"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in toZList"
|
||||
@@ -205,19 +205,19 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级">
|
||||
<el-form-item :label="$t('task.select.Priority')">
|
||||
<el-input v-model="form.priority" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具号">
|
||||
<el-form-item :label="$t('task.select.Vehicle_number')">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述信息" prop="description">
|
||||
<el-form-item :label="$t('task.select.Description')" prop="description">
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
<el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
@@ -230,23 +230,23 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column v-if="false" prop="task_id" label="任务标识" />
|
||||
<el-table-column prop="task_code" label="任务号" />
|
||||
<el-table-column prop="vehicle_code" label="载具号" />
|
||||
<el-table-column prop="task_status" label="任务状态">
|
||||
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" />
|
||||
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
|
||||
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')">
|
||||
<template slot-scope="scope">
|
||||
<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=='0' ">{{ $t('task.select.Ready') }}</span>
|
||||
<span v-if="scope.row.task_status=='1' ">{{ $t('task.select.In_progress') }}</span>
|
||||
<span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="priority" label="任务优先级" />
|
||||
<el-table-column prop="start_point_code" label="起点" />
|
||||
<el-table-column prop="next_point_code" label="终点" />
|
||||
<el-table-column prop="matarial" label="物料" />
|
||||
<el-table-column prop="quantity" label="数量" />
|
||||
<el-table-column prop="remark" label="备注" />
|
||||
<el-table-column prop="create_by" label="创建者" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="135" />
|
||||
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />
|
||||
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
|
||||
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
|
||||
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
|
||||
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
|
||||
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
|
||||
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
|
||||
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
v-model="query.task_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入任务号"
|
||||
:placeholder="$t('TaskRecord.table.Task_code')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -19,7 +19,7 @@
|
||||
value="1"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入任务号"
|
||||
:placeholder="$t('TaskRecord.table.Task_code')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -28,7 +28,7 @@
|
||||
v-model="query.vehicle_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入载具号"
|
||||
:placeholder="$t('TaskRecord.table.Vehicle_number')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -38,7 +38,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="物料类型"
|
||||
:placeholder="$t('task.txt_box.Material_type')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -50,7 +50,7 @@
|
||||
clearable
|
||||
filterable
|
||||
size="small"
|
||||
placeholder="任务状态"
|
||||
:placeholder="$t('task.txt_box.Task_status')"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
@@ -61,7 +61,7 @@
|
||||
v-model="query.point_code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="输入起点或终点"
|
||||
:placeholder="$t('task.txt_box.Origin_or_destination')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -87,25 +87,25 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column v-if="false" prop="task_id" label="任务标识" />
|
||||
<el-table-column prop="task_code" label="任务号(指令编号)" />
|
||||
<el-table-column prop="vehicle_code" label="载具号" />
|
||||
<el-table-column prop="task_status" label="状态">
|
||||
<el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" />
|
||||
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
|
||||
<el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')">
|
||||
<template slot-scope="scope">
|
||||
<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=='0' ">{{ $t('task.select.Ready') }}</span>
|
||||
<span v-if="scope.row.task_status=='1' ">{{ $t('task.select.In_progress') }}</span>
|
||||
<span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="priority" label="任务优先级" />
|
||||
<el-table-column prop="start_point_code" label="起点" />
|
||||
<el-table-column prop="next_point_code" label="终点" />
|
||||
<el-table-column prop="start_point_code2" label="起点2" />
|
||||
<el-table-column prop="next_point_code2" label="终点2" />
|
||||
<el-table-column prop="matarial" label="物料" />
|
||||
<el-table-column prop="quantity" label="数量" />
|
||||
<el-table-column prop="remark" label="备注" />
|
||||
<el-table-column prop="create_by" label="创建者" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="135" />
|
||||
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />
|
||||
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
|
||||
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
|
||||
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" />
|
||||
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" />
|
||||
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
|
||||
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
|
||||
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
|
||||
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
|
||||
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
v-model="query.code"
|
||||
size="small"
|
||||
clearable
|
||||
placeholder="编号"
|
||||
:placeholder="$t('TaskRecord.table.Numbering')"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
@@ -31,7 +31,7 @@
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:visible.sync="crud.status.cu"
|
||||
:title="crud.status.title"
|
||||
width="500px"
|
||||
>
|
||||
@@ -39,16 +39,16 @@
|
||||
<el-form-item label="unified_key">
|
||||
<el-input v-model="form.unified_key" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="编号">
|
||||
<el-form-item :label="$t('TaskRecord.table.Numbering')">
|
||||
<el-input v-model="form.key" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="值">
|
||||
<el-form-item label="$t('TaskRecord.table.Numbering')">
|
||||
<el-input v-model="form.value" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
<el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
@@ -61,20 +61,20 @@
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column prop="unified_key" label="unified_key" />
|
||||
<el-table-column prop="key" label="编号" />
|
||||
<el-table-column prop="value" label="值" />
|
||||
<el-table-column prop="key" :label="$t('TaskRecord.table.Numbering')" />
|
||||
<el-table-column prop="value" :label="$t('TaskRecord.table.Numbering')" />
|
||||
<el-table-column
|
||||
v-permission="['admin','instruction:edit','instruction:del']"
|
||||
fixed="left"
|
||||
label="操作"
|
||||
:label="$t('task.select.Operation')"
|
||||
width="150px"
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<!-- <template slot-scope="scope">
|
||||
<el-button slot="right" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="dialogFormVisible = true">
|
||||
查询历史
|
||||
</el-button>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
|
||||
Reference in New Issue
Block a user