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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-01 16:18:27 +08:00
parent b1dd30e61c
commit e4df9e20af
19 changed files with 556 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -69,7 +69,7 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
<!-- <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
<el-input
v-model="query.block_num"
clearable
@@ -105,7 +105,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>-->
<el-form-item label="锁定类型">
<el-select
v-model="query.lock_type"
@@ -194,8 +194,8 @@
size="mini"
type="primary"
icon="el-icon-refresh"
@click="sync"
:loading="sync_flag"
@click="sync"
>
仓位同步
</el-button>
@@ -307,7 +307,7 @@
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>

62
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -26,13 +26,13 @@
v-model="query.vehicle_code"
clearable
style="width: 180px"
placeholder="载具号"
placeholder="载具号1"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位编码">
<el-input
v-model="query.point_code"
v-model="query.point_code1"
clearable
style="width: 180px"
placeholder="起点"
@@ -48,24 +48,6 @@
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="完成方式">
<el-select
v-model="query.finished_type"
style="width: 180px"
placeholder="完成方式"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in finishTypeList"
:key="item.code"
clearable
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
@@ -112,37 +94,19 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<!-- <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />-->
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<!--<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>-->
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<!--<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />-->
<el-table-column prop="point_code1" label="点位1" width="100" />
<el-table-column prop="point1_region_name" label="区域1" width="100" />
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="point_code1" label="点位1" width="100" show-overflow-tooltip />
<el-table-column prop="point_code2" label="点位2" width="100" show-overflow-tooltip />
<el-table-column prop="point_code3" label="点位3" width="100" show-overflow-tooltip />
<el-table-column prop="point_code4" label="点位4" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码1" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" width="135" show-overflow-tooltip />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"