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

fix 所有任务

Browse Source
This commit is contained in:
张江玮
2023-04-18 10:20:48 +08:00
parent 7d8cb55911
commit f255c44516
24 changed files with 111 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -131,6 +131,8 @@
<el-table-column prop="b" label="短边长度" width="75" />
<el-table-column prop="h" label="梯形高度" width="75" />
<el-table-column prop="w" label="砖块厚度" width="75" />
<el-table-column prop="create_name" label="创建人" width="75" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_optname" label="修改人" width="75" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column

40
lms/nladmin-ui/src/views/wms/pdm/device/index.vue
View File

@@ -40,6 +40,22 @@
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" style="width: 300px" />
</el-form-item>
<el-form-item label="所属区域" prop="region_code">
<el-select
v-model="form.region_code"
placeholder="所属区域"
class="filter-item"
style="width: 300px"
clearable
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="设备类型" prop="device_model">
<el-select
v-model="form.device_model"
@@ -59,23 +75,6 @@
<el-form-item label="设备产能">
<el-input v-model="form.productivity" type="number" style="width: 300px" />
</el-form-item>
<el-form-item label="所属区域">
<el-select
v-model="form.region_code"
clearable
filterable
size="mini"
placeholder="所属区域"
class="filter-item"
>
<el-option
v-for="item in regionList"
:key="item.region_code"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="外部编码">
<el-input v-model="form.extend_code" style="width: 300px" />
</el-form-item>
@@ -100,13 +99,13 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_model" label="设备型号" min-width="100" show-overflow-tooltip>
<el-table-column prop="region_name" label="所属区域" />
<el-table-column prop="device_model" label="设备类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.pdm_device_type[scope.row.device_model] }}
</template>
</el-table-column>
<el-table-column prop="productivity" label="设备产能" />
<el-table-column prop="region_name" label="所属区域" />
<el-table-column prop="remark" label="备注" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
@@ -178,6 +177,9 @@ export default {
],
device_model: [
{ required: true, message: '设备类型不能为空', trigger: 'blur' }
],
region_code: [
{ required: true, message: '所属区域不能为空', trigger: 'blur' }
]
},
regionList: []

23
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -15,30 +15,27 @@
<el-input
v-model="query.produceorder_code"
clearable
size="small"
placeholder="请输入工单编号"
placeholder="工单编号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-form-item label="物料编码">
<el-input
v-model="query.material"
clearable
size="small"
placeholder="物料编码名称"
placeholder="物料编码"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label=" 工单状态">
<el-form-item label="工单状态">
<el-select
v-model="order_status"
style="width: 200px"
clearable
multiple
placeholder="请选择"
class="filter-item"
@change="handTaskStatus"
>
<el-option
@@ -123,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划数量" prop="plan_qty">
<el-form-item label="计划数量/重量" prop="plan_qty">
<el-input v-model="form.plan_qty" type="number" style="width: 300px" />
</el-form-item>
</el-col>
@@ -143,7 +140,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-show="typeof (form.device_code) === 'string' && form.device_code.startsWith('FJ')" label="木托盘类型" prop="vehicle_type">
<el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" style="width: 300px" filterable placeholder="请选择">
<el-option
v-for="item in dict.wood_vehicle_type"
@@ -298,7 +295,8 @@ const defaultForm = {
is_pri: '0',
ext_code: null,
qualified_qty: '0',
unqualified_qty: '0'
unqualified_qty: '0',
region_code: null
}
export default {
name: 'Produceshiftorder',
@@ -399,6 +397,7 @@ export default {
this.form.device_code = row.device_code
this.form.device_id = row.device_id
this.form.device_name = row.device_name
this.form.region_code = row.region_code
},
// 下发
submits(row) {

1
lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
View File

@@ -53,6 +53,7 @@
{{ dict.label.pdm_device_type[scope.row.device_model] }}
</template>
</el-table-column>
<el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
<el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
</el-table>
<!--分页组件-->

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

@@ -8,7 +8,7 @@
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
label-suffix="："
>
<el-form-item label="编码名称">
<el-input
@@ -313,12 +313,13 @@
{{ dict.label.true_or_false[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<el-table-column prop="vehicle_type" label="载具类型" min-width="80">
<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="120" />
<el-table-column prop="vehicle_code" label="载具编码" min-width="80" />
<el-table-column prop="material_code" label="物料编码" min-width="260" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />

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

@@ -7,66 +7,36 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="90px"
label-suffix="："
>
<el-form-item label="任务号">
<label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
<el-form-item label="任务编码">
<el-input
v-model="query.task_code"
clearable
style="width: 180px"
placeholder="任务号"
placeholder="任务编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
clearable
style="width: 180px"
placeholder="载具号"
placeholder="载具编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位编码">
<el-form-item label="起点终点">
<el-input
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点"
placeholder="起点终点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务类型">
<treeselect
v-model="query.task_type"
:load-options="loadChildNodes"
:options="classes1"
style="width: 180px"
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
v-model="query.createTime"
@@ -117,25 +87,26 @@
<el-table-column v-if="false" 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 >
<el-table-column v-if="false" 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 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_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
<el-table-column prop="point1_name" label="起点" width="150" />
<el-table-column prop="point1_region_name" label="起点区域" width="80" />
<el-table-column prop="point2_name" label="终点" min-width="150" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="终点区域" min-width="80" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="80" 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="120" />
<el-table-column prop="point1_region_name" label="区域1" width="120" />
<el-table-column prop="point_code2" label="点位2" min-width="120" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="260" 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" />
@@ -218,7 +189,7 @@ export default {
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
},
optShow: {
add: false,
@@ -254,7 +225,6 @@ export default {
crudTask.getFinishType().then(data => {
this.finishTypeList = data
})
this.crud.query.task_status = ['-1']
this.crud.toQuery()
},
methods: {