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

代码更新

Browse Source
This commit is contained in:
ludj
2023-05-18 16:26:36 +08:00
parent d249c7db0b
commit 69d16d78ed
10 changed files with 529 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,17 +5,46 @@
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">工单编号</label>
<el-input v-model="query.workorder_code" clearable placeholder="工单编号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<label class="el-form-item-label">点位编码</label>
<el-input v-model="query.point_code" clearable placeholder="点位编码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input
v-model="query.workorder_code"
clearable
placeholder="工单编号"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<label class="el-form-item-label">设备编码</label>
<el-input
v-model="query.point_code"
clearable
placeholder="设备编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation :crud="crud" />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px" label-suffix=":">
<el-form-item label="所属车间">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="820px"
>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="135px"
label-suffix=":"
>
<el-form-item v-if="false" label="所属车间">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
@@ -31,6 +60,15 @@
<el-form-item label="工单编号" prop="workorder_code">
<el-input v-model="form.workorder_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="form.material_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="计划数量" prop="plan_qty">
<el-input-number
v-model.number="form.plan_qty"
@@ -63,46 +101,38 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial"/>
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="form.material_code" style="width: 240px;" disabled/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" style="width: 240px;" disabled/>
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-date-picker
v-model="form.planproducestart_date"
type="datetime"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="计划结束时间" prop="planproduceend_date">
<el-date-picker
v-model="form.planproduceend_date"
type="datetime"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="实际开始时间">
<el-date-picker
v-model="form.realproducestart_date"
type="datetime"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="实际结束时间">
<el-date-picker
v-model="form.realproduceend_date"
type="datetime"
style="width: 240px;"
placeholder="选择日期时间">
</el-date-picker>
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="静置时间(分钟)" prop="standing_time">
<el-input-number
@@ -112,11 +142,17 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="工单类型" prop="workorder_type">
<el-form-item v-if="false" label="工单类型" prop="workorder_type">
<el-input v-model="form.workorder_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="所属区域" prop="region_code">
<el-select v-model="form.region_code" filterable placeholder="请选择" style="width: 240px;" @change="setRegionName">
<el-select
v-model="form.region_code"
filterable
placeholder="请选择"
style="width: 240px;"
@change="setRegionName"
>
<el-option
v-for="item in regionList"
:key="item.region_code"
@@ -129,10 +165,16 @@
</el-select>
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 240px;" disabled/>
<el-input v-model="form.region_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-select v-model="form.point_code" filterable placeholder="请选择" style="width: 240px;" @change="setPointName">
<el-form-item label="设备编码" prop="point_code">
<el-select
v-model="form.point_code"
filterable
placeholder="请选择"
style="width: 240px;"
@change="setPointName"
>
<el-option
v-for="item in pointList"
:key="item.point_code"
@@ -144,8 +186,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled/>
<el-form-item label="设备名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="是否自动搬运" prop="is_needmove">
<el-radio-group v-model="form.is_needmove" style="width: 240px">
@@ -160,36 +202,71 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')"/>
<el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')"/>
<el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')"/>
<el-table-column prop="material_id" label="物料标识" :min-width="flexWidth('material_id',crud.data,'物料标识')"/>
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')"/>
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')"/>
<el-table-column prop="planproducestart_date" label="计划开始时间" :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"/>
<el-table-column prop="planproduceend_date" label="计划结束时间" :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"/>
<el-table-column prop="realproducestart_date" label="实际开始时间" :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"/>
<el-table-column prop="realproduceend_date" label="实际结束时间" :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"/>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"/>
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')"/>
<el-table-column prop="workorder_status" label="工单状态" :min-width="flexWidth('workorder_status',crud.data,'工单状态')"/>
<el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')" />
<el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
<el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')" />
<el-table-column prop="material_id" label="物料标识" :min-width="flexWidth('material_id',crud.data,'物料标识')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')" />
<el-table-column
prop="planproducestart_date"
label="计划开始时间"
:min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"
/>
<el-table-column
prop="planproduceend_date"
label="计划结束时间"
:min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"
/>
<el-table-column
prop="realproducestart_date"
label="实际开始时间"
:min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"
/>
<el-table-column
prop="realproduceend_date"
label="实际结束时间"
:min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"
/>
<el-table-column
prop="standing_time"
label="静置时间(分钟)"
:min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
/>
<el-table-column prop="point_code" label="设备编码" :min-width="flexWidth('point_code',crud.data,'设备编码')" />
<el-table-column prop="point_name" label="设备名称" :min-width="flexWidth('point_name',crud.data,'设备名称')" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column
prop="workorder_status"
label="工单状态"
:min-width="flexWidth('workorder_status',crud.data,'工单状态')"
/>
<el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
<template slot-scope="scope">
{{scope.row.is_needmove?'是':'否'}}
{{ scope.row.is_needmove ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')"/>
<el-table-column prop="passback_status" label="回传MES状态" :min-width="flexWidth('passback_status',crud.data,'回传MES状态')"/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')" />
<el-table-column
prop="passback_status"
label="回传MES状态"
:min-width="flexWidth('passback_status',crud.data,'回传MES状态')"
/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -202,7 +279,7 @@
<!--分页组件-->
<pagination />
</div>
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged"/>
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" />
</div>
</template>
@@ -210,7 +287,7 @@
import crudPdmBdWorkorder from './pdmBdWorkorder'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -257,46 +334,35 @@ export default {
crudMethod: { ...crudPdmBdWorkorder }
})
},
created() {
this.getWorkShopList()
this.getRegionList()
},
data() {
return {
permission: {
},
permission: {},
rules: {
workorder_code: [
{ required: true, message: '工单编码不能为空', trigger: 'blur' }
material_code: [
{ required: true, message: '物料不能为空', trigger: 'blur' }
],
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
real_qty: [
{ required: true, message: '实际数量不能为空', trigger: 'blur' }
],
planproducestart_date: [
{ required: true, message: '计划开始不能为空', trigger: 'change' }
],
planproduceend_date: [
{ required: true, message: '计划结束不能为空', trigger: 'change' }
],
standing_time: [
{ required: true, message: '静置时间不能为空', trigger: 'change' }
],
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'change' }
{ required: true, message: '设备编码不能为空', trigger: 'change' }
],
region_code: [
{ required: true, message: '区域编码不能为空', trigger: 'change' }
],
workorder_type: [
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
]
/* workorder_type: [
{ required: true, message: '工单类型不能为空', trigger: 'blur' }
]*/
},
queryTypeOptions: [
{ key: 'workorder_code', display_name: '工单编号' },
{ key: 'point_code', display_name: '点位编码' }
{ key: 'point_code', display_name: '设备编码' }
],
workShopList: [],
regionList: [],
@@ -305,6 +371,10 @@ export default {
materialDialog: false
}
},
created() {
this.getWorkShopList()
this.getRegionList()
},
methods: {
item() {
return item