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

更新

Browse Source
This commit is contained in:
gengby
2023-01-16 17:53:52 +08:00
parent af7dbc6d8e
commit 18461c31aa
14 changed files with 1553 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="立库任务类型" v-if = "form.task_type == '7'">
<el-form-item v-if="form.task_type == '7'" label="立库任务类型">
<el-select
v-model="form.storage_task_type"
style="width: 370px;"
@@ -264,36 +264,36 @@
/>
</el-select>
</el-form-item>
<el-form-item label="起点2" prop="start_point_code2">
<el-select
v-model="form.start_point_code2"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item label="终点2" prop="next_point_code2">
<el-select
v-model="form.next_point_code2"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="起点2" prop="start_point_code2">-->
<!-- <el-select-->
<!-- v-model="form.start_point_code2"-->
<!-- style="width: 370px;"-->
<!-- filterable-->
<!-- placeholder="请选择"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deviceList"-->
<!-- :key="item.device_code"-->
<!-- :label="item.device_code"-->
<!-- :value="item.device_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="终点2" prop="next_point_code2">-->
<!-- <el-select-->
<!-- v-model="form.next_point_code2"-->
<!-- style="width: 370px;"-->
<!-- filterable-->
<!-- placeholder="请选择"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deviceList"-->
<!-- :key="item.device_code"-->
<!-- :label="item.device_code"-->
<!-- :value="item.device_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
@@ -314,33 +314,33 @@
<el-table-column type="selection" width="25" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" width="100" />
<el-table-column prop="task_type" label="任务类型" width="120">
<el-table-column prop="task_type" label="任务类型" width="120">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
</el-table-column>
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="vehicle_code" label="载具号" width="100" />
<el-table-column prop="task_status" label="任务状态" width="60">
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<!-- <el-table-column prop="vehicle_code" label="载具号" width="100" />-->
<el-table-column prop="task_status" label="任务状态" width="100">
<template slot-scope="scope" width="60">
<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>
</template>
</el-table-column>
<el-table-column prop="priority" label="优先级" width="100"/>
<el-table-column prop="start_point_code" label="取货点1" width="100px" />
<el-table-column prop="put_point_code" label="倒料点" width="100" />
<el-table-column prop="next_point_code" label="放货点1" width="120px" />
<el-table-column prop="start_point_code2" label="取货点2" width="120px" />
<el-table-column prop="next_point_code2" label="放货点2" width="120px" />
<!-- <el-table-column prop="compound_task" label="复合任务">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_task==='0' ">否</span>-->
<!-- <span v-if="scope.row.compound_task==='1' ">是</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
<el-table-column prop="start_point_code" label="取货点" width="100px" />
<!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
<el-table-column prop="next_point_code" label="放货点" width="120px" />
<el-table-column prop="priority" label="优先级" width="100" />
<!-- <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
<!-- <el-table-column prop="compound_task" label="复合任务">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_task==='0' ">否</span>-->
<!-- <span v-if="scope.row.compound_task==='1' ">是</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
@@ -460,7 +460,7 @@ export default {
task_id: null,
vehicle_code: null,
vehicle_type: null,
task_type: '1',
task_type: '3',
storage_task_type: '',
task_status: null,
priority: 1,
@@ -479,7 +479,7 @@ export default {
to_x: null,
to_y: null,
to_z: null,
agv_system_type: ''
agv_system_type: '2'
},
rules: {
start_point_code: [