缓存线载具、位置、区域管理的基础功能、代码生成的模板修改
This commit is contained in:
@@ -2,7 +2,7 @@ import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/vehilematerial',
|
||||
url: 'api/cachelinePosition',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -10,7 +10,7 @@ export function add(data) {
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/vehilematerial/',
|
||||
url: 'api/cachelinePosition/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
@@ -18,7 +18,7 @@ export function del(ids) {
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/vehilematerial',
|
||||
url: 'api/cachelinePosition',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
@@ -1,43 +0,0 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/vehicle',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/vehicle/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/vehicle',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function changeActive(data) {
|
||||
return request({
|
||||
url: 'api/vehicle/changeActive',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function changePrint(data) {
|
||||
return request({
|
||||
url: 'api/vehicle/changePrint',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export default { add, edit, del, changeActive, changePrint }
|
||||
@@ -2,7 +2,7 @@ import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/materiorecord',
|
||||
url: 'api/cachelineVehicle',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@@ -10,7 +10,7 @@ export function add(data) {
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/materiorecord/',
|
||||
url: 'api/cachelineVehicle/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
@@ -18,7 +18,7 @@ export function del(ids) {
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/materiorecord',
|
||||
url: 'api/cachelineVehicle',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
52
mes/qd/src/api/wms/sch/region.js
Normal file
52
mes/qd/src/api/wms/sch/region.js
Normal file
@@ -0,0 +1,52 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function add(data) {
|
||||
return request({
|
||||
url: 'api/region',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function del(ids) {
|
||||
return request({
|
||||
url: 'api/region/',
|
||||
method: 'delete',
|
||||
data: ids
|
||||
})
|
||||
}
|
||||
|
||||
export function edit(data) {
|
||||
return request({
|
||||
url: 'api/region',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function changeActive(data) {
|
||||
return request({
|
||||
url: 'api/region/changeActive',
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function getPointStatusSelectById(id) {
|
||||
return request({
|
||||
url: 'api/region/getPointStatusSelectById',
|
||||
method: 'post',
|
||||
data: id
|
||||
})
|
||||
}
|
||||
|
||||
export function getPointTypeSelectById(id) {
|
||||
return request({
|
||||
url: 'api/region/getPointTypeSelectById',
|
||||
method: 'post',
|
||||
data: id
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }
|
||||
@@ -1,337 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
|
||||
<el-form-item label="模糊查询">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
size="mini"
|
||||
placeholder="输入载具编码"
|
||||
prefix-icon="el-icon-search"
|
||||
class="filter-item"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="缓存线">
|
||||
<el-select
|
||||
v-model="query.extdevice_code"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="缓存线"
|
||||
class="filter-item"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.ST_CACHELINE_EXTDEVICE_CODE"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<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="900px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缓存线" prop="extdevice_code">
|
||||
<el-select v-model="form.extdevice_code" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in dict.ST_CACHELINE_EXTDEVICE_CODE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缓存线层数" prop="layer_num">
|
||||
<el-select v-model="form.layer_num" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in layList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="出入类型" prop="io_type">
|
||||
<el-select v-model="form.io_type" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in dict.ST_CacheLine_IOTYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="载具标识" prop="vehicle_uuid">
|
||||
<el-input v-model="form.vehicle_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="载具编码" prop="vehicle_code">
|
||||
<el-input
|
||||
v-model="form.vehicle_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="vehicleShow=true"
|
||||
@clear="form.vehicle_code='',form.vehicle_uuid=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="工序标识" prop="workprocedure_uuid">
|
||||
<el-input v-model="form.workprocedure_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序编号" prop="workprocedure_code">
|
||||
<el-input
|
||||
v-model="form.workprocedure_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="workProceDureShow=true"
|
||||
@clear="form.workprocedure_uuid='',form.workprocedure_code,form.workprocedure_name=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="载具状态" prop="vehicle_status">
|
||||
<el-select v-model="form.vehicle_status" filterable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in dict.ST_CacheLine_VehicleStatus"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="物料标识" prop="material_uuid">
|
||||
<el-input v-model="form.material_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料" prop="material_code">
|
||||
<el-input
|
||||
v-model="form.material_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="materialShow=true"
|
||||
@clear="form.material_uuid='',form.material_code=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="料箱物料数量" prop="quantity">
|
||||
<el-input v-model="form.quantity" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="料箱物料重量" prop="weight">
|
||||
<el-input v-model="form.weight" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料工单标识" prop="produceorder_uuid">
|
||||
<el-input v-model="form.produceorder_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料工单编码" prop="produceorder_code">
|
||||
<el-input v-model="form.produceorder_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</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>
|
||||
</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-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" prop="record_uuid" label="记录标识" />
|
||||
<el-table-column v-if="false" prop="device_uuid" label="缓存线标识" />
|
||||
<el-table-column prop="extdevice_code" label="缓存线编码" />
|
||||
<el-table-column prop="device_name" label="缓存线名字" />
|
||||
<el-table-column prop="layer_num" label="缓存线层数" />
|
||||
<el-table-column v-if="false" prop="vehicle_uuid" label="载具标识" />
|
||||
<el-table-column prop="vehicle_code" label="载具编码" />
|
||||
<el-table-column v-if="false" prop="workprocedure_uuid" label="工序标识" />
|
||||
<el-table-column prop="vehicle_status" label="载具状态">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.ST_CacheLine_VehicleStatus[scope.row.vehicle_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="material_uuid" label="物料标识" />
|
||||
<el-table-column prop="material_code" label="物料编码" />
|
||||
<el-table-column prop="quantity" label="料箱物料数量" width="150px" />
|
||||
<el-table-column prop="weight" label="料箱物料重量" width="150px" :formatter="crud.formatNum2" />
|
||||
<el-table-column v-if="false"prop="produceorder_uuid" label="物料工单标识" />
|
||||
<el-table-column prop="produceorder_code" label="物料工单编码" width="150px" />
|
||||
<el-table-column prop="create_time" label="创建时间"width="150px" />
|
||||
<el-table-column prop="update_time" label="更新时间" width="150px" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
<VehicleDtl :dialog-show.sync="vehicleShow" @tableChanged2="vehicleChange" />
|
||||
<WorkProcedureDtl :dialog-show.sync="workProceDureShow" @tableChanged2="WorkProceDureChanged" />
|
||||
<!-- <OutMaterDtl :dialog-show.sync="materialShow" @tableChanged2="tableChanged2" />-->
|
||||
<OutMaterDtl
|
||||
:dialog-show.sync="materialShow"
|
||||
:is-single="true"
|
||||
:mater-opt-code="materType"
|
||||
@setMaterValue="tableChanged2"
|
||||
/>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudMateriorecord from '@/api/wms/cacheline/materiorecord'
|
||||
import CRUD, { presenter, header, form, crud } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import VehicleDtl from '@/views/wms/cacheline/vehiclematerial/VehicleDialog'
|
||||
import WorkProcedureDtl from '@/views/wms/cacheline/vehiclematerial/workProceDureDialog'
|
||||
import OutMaterDtl from '@/views/wms/pub/MaterDialog'
|
||||
|
||||
const defaultForm = { record_uuid: null, device_uuid: null, extdevice_code: null, device_name: null, layer_num: '1', io_type: null, vehicle_uuid: null, vehicle_code: null, workprocedure_uuid: null, vehicle_status: null, material_uuid: null, quantity: null, weight: null, produceorder_uuid: null, produceorder_code: null, create_time: null, update_time: null, is_active: null, is_delete: null }
|
||||
export default {
|
||||
name: 'Materiorecord',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation, VehicleDtl, WorkProcedureDtl, OutMaterDtl },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
dicts: ['ST_CacheLine_IOTYPE', 'ST_CacheLine_VehicleStatus', 'ST_CACHELINE_EXTDEVICE_CODE'],
|
||||
cruds() {
|
||||
return CRUD({ title: '缓存线物料出入记录', url: 'api/materiorecord', idField: 'record_uuid', sort: 'record_uuid,desc', crudMethod: { ...crudMateriorecord }})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
materType: '01',
|
||||
vehicleShow: false,
|
||||
workProceDureShow: false,
|
||||
materialShow: false,
|
||||
permission: {
|
||||
},
|
||||
layList: [
|
||||
{
|
||||
'value': '1',
|
||||
'label': '一层'
|
||||
},
|
||||
{
|
||||
'value': '2',
|
||||
'label': '二层'
|
||||
},
|
||||
{
|
||||
'value': '3',
|
||||
'label': '三层'
|
||||
}
|
||||
],
|
||||
rules: {
|
||||
device_uuid: [
|
||||
{ required: true, message: '缓存线标识不能为空', trigger: 'blur' }
|
||||
],
|
||||
extdevice_code: [
|
||||
{ required: true, message: '缓存线编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
device_name: [
|
||||
{ required: true, message: '缓存线名字不能为空', trigger: 'blur' }
|
||||
],
|
||||
layer_num: [
|
||||
{ required: true, message: '缓存线层数不能为空', trigger: 'blur' }
|
||||
],
|
||||
io_type: [
|
||||
{ required: true, message: '出入类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
vehicle_uuid: [
|
||||
{ required: true, message: '载具标识不能为空', trigger: 'blur' }
|
||||
],
|
||||
vehicle_code: [
|
||||
{ required: true, message: '载具编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
vehicle_status: [
|
||||
{ required: true, message: '载具状态不能为空', trigger: 'blur' }
|
||||
],
|
||||
quantity: [
|
||||
{ required: true, message: '料箱物料数量不能为空', trigger: 'blur' }
|
||||
],
|
||||
weight: [
|
||||
{ required: true, message: '料箱物料重量不能为空', trigger: 'blur' }
|
||||
]
|
||||
}}
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
vehicleChange(row) {
|
||||
this.form.vehicle_uuid = row.storagevehicle_id
|
||||
this.form.vehicle_code = row.storagevehicle_code
|
||||
},
|
||||
tableChanged2(row) {
|
||||
this.form.material_uuid = row.material_id
|
||||
this.form.material_code = row.material_code
|
||||
},
|
||||
WorkProceDureChanged(row) {
|
||||
this.form.workprocedure_uuid = row.workprocedure_id
|
||||
this.form.workprocedure_code = row.workprocedure_code
|
||||
this.form.workprocedure_name = row.workprocedure_name
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
170
mes/qd/src/views/wms/cacheline/position/index.vue
Normal file
170
mes/qd/src/views/wms/cacheline/position/index.vue
Normal file
@@ -0,0 +1,170 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, 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="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="缓存线位置编码" prop="position_code">
|
||||
<el-input v-model="form.position_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="缓存线位置名字" prop="position_name">
|
||||
<el-input v-model="form.position_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="位置顺序号" prop="positionOrder_no">
|
||||
<el-input v-model="form.positionOrder_no" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="缓存线编码" prop="cacheLine_code">
|
||||
<el-input v-model="form.cacheLine_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="缓存线层数" prop="layer_num">
|
||||
<el-input v-model="form.layer_num" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="优先层顺序" prop="priority_layer_no">
|
||||
<el-input v-model="form.priority_layer_no" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="料箱展示顺序号" prop="order_no">
|
||||
<el-input v-model="form.order_no" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具编码">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生产区域" prop="product_area">
|
||||
<el-input v-model="form.product_area" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否空位" prop="is_empty">
|
||||
<el-input v-model="form.is_empty" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否展示" prop="is_show">
|
||||
<el-input v-model="form.is_show" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否可用" prop="is_active">
|
||||
<el-input v-model="form.is_active" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否删除" prop="is_delete">
|
||||
<el-input v-model="form.is_delete" 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>
|
||||
</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-column type="selection" width="55" />
|
||||
<el-table-column prop="position_code" label="缓存线位置编码" width="120"/>
|
||||
<el-table-column prop="position_name" label="缓存线位置名字" width="120"/>
|
||||
<el-table-column prop="positionOrder_no" label="位置顺序号" />
|
||||
<el-table-column prop="cacheLine_code" label="缓存线编码" />
|
||||
<el-table-column prop="layer_num" label="缓存线层数" />
|
||||
<el-table-column prop="priority_layer_no" label="优先层顺序" />
|
||||
<el-table-column prop="order_no" label="料箱展示顺序号" width="120"/>
|
||||
<el-table-column prop="vehicle_code" label="载具编码" />
|
||||
<el-table-column prop="product_area" label="生产区域" />
|
||||
<el-table-column prop="is_empty" label="是否空位" />
|
||||
<el-table-column prop="is_show" label="是否展示" />
|
||||
<el-table-column prop="is_active" label="是否可用" />
|
||||
<el-table-column prop="is_delete" label="是否删除" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudCachelinePosition from '@/api/wms/cacheline/position/cachelinePosition'
|
||||
import CRUD, {crud, form, header, presenter} from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation.vue'
|
||||
import crudOperation from '@crud/CRUD.operation.vue'
|
||||
import udOperation from '@crud/UD.operation.vue'
|
||||
import pagination from '@crud/Pagination.vue'
|
||||
|
||||
const defaultForm = {
|
||||
position_code: null,
|
||||
position_name: null,
|
||||
positionOrder_no: null,
|
||||
cacheLine_code: null,
|
||||
layer_num: null,
|
||||
priority_layer_no: null,
|
||||
order_no: null,
|
||||
vehicle_code: null,
|
||||
product_area: null,
|
||||
is_empty: null,
|
||||
is_show: null,
|
||||
is_active: null,
|
||||
is_delete: null
|
||||
}
|
||||
export default {
|
||||
name: 'CachelinePosition',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({ title: '缓存线位置', url: 'api/cachelinePosition', idField: 'position_code', sort: 'position_code,desc', crudMethod: { ...crudCachelinePosition }})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
permission: {
|
||||
},
|
||||
rules: {
|
||||
position_code: [
|
||||
{ required: true, message: '缓存线位置编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
position_name: [
|
||||
{ required: true, message: '缓存线位置名字不能为空', trigger: 'blur' }
|
||||
],
|
||||
positionOrder_no: [
|
||||
{ required: true, message: '位置顺序号不能为空', trigger: 'blur' }
|
||||
],
|
||||
cacheLine_code: [
|
||||
{ required: true, message: '缓存线编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
layer_num: [
|
||||
{ required: true, message: '缓存线层数不能为空', trigger: 'blur' }
|
||||
],
|
||||
priority_layer_no: [
|
||||
{ required: true, message: '优先层顺序不能为空', trigger: 'blur' }
|
||||
],
|
||||
order_no: [
|
||||
{ required: true, message: '料箱展示顺序号不能为空', trigger: 'blur' }
|
||||
],
|
||||
product_area: [
|
||||
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_empty: [
|
||||
{ required: true, message: '是否空位不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_show: [
|
||||
{ required: true, message: '是否展示不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_active: [
|
||||
{ required: true, message: '是否可用不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_delete: [
|
||||
{ required: true, message: '是否删除不能为空', trigger: 'blur' }
|
||||
]
|
||||
} }
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -16,18 +16,24 @@
|
||||
<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="500px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||
<el-form-item label="载具编码" prop="vehicle_code">
|
||||
<el-input v-model="form.vehicle_code" style="width: 200px;" />
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具条码值">
|
||||
<el-input v-model="form.vehicle_value" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否打印" prop="is_print">
|
||||
<el-radio v-for="item in dict.IS_OR_NOT" :key="item.id" v-model="form.is_print" :label="item.value">{{ item.label }}</el-radio>
|
||||
<el-input v-model="form.is_print" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="false" label="打印时间">
|
||||
<el-input v-model="form.print_time" style="width: 200px;" />
|
||||
<el-form-item label="生产区域" prop="product_area">
|
||||
<el-input v-model="form.product_area" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否可用" prop="is_active">
|
||||
<el-radio v-for="item in dict.IS_OR_NOT" :key="item.id" v-model="form.is_active" :label="item.value">{{ item.label }}</el-radio>
|
||||
<el-input v-model="form.is_active" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否删除" prop="is_delete">
|
||||
<el-input v-model="form.is_delete" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -39,33 +45,17 @@
|
||||
<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="vehicle_code" label="载具编码" />
|
||||
<el-table-column prop="is_print" label="是否打印">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
:value="format_is_print(scope.row.is_print)"
|
||||
active-color="#409EFF"
|
||||
inactive-color="#F56C6C"
|
||||
@change="changeEnabled1(scope.row, scope.row.is_print)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="create_time" label="创建时间" width="150px" />
|
||||
<el-table-column prop="update_time" label="更新时间" width="150px" />
|
||||
<el-table-column prop="vehicle_value" label="载具条码值" />
|
||||
<el-table-column prop="print_num" label="打印次数" />
|
||||
<el-table-column prop="is_print" label="是否打印" />
|
||||
<el-table-column prop="print_time" label="打印时间" />
|
||||
<el-table-column prop="is_active" label="是否可用">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
:value="format_is_active(scope.row.is_active)"
|
||||
active-color="#409EFF"
|
||||
inactive-color="#F56C6C"
|
||||
@change="changeEnabled(scope.row, scope.row.is_active)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="create_id" label="创建人" />
|
||||
<el-table-column prop="product_area" label="生产区域" />
|
||||
<el-table-column prop="is_active" label="是否可用" />
|
||||
<el-table-column prop="is_delete" label="是否删除" />
|
||||
<el-table-column prop="create_name" label="创建人" />
|
||||
<el-table-column v-if="false" prop="update_optid" label="修改人" />
|
||||
<el-table-column prop="update_optname" label="修改人" />
|
||||
<el-table-column prop="create_time" label="创建时间" />
|
||||
<el-table-column prop="update_name" label="修改人" />
|
||||
<el-table-column prop="update_time" label="修改时间" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
@@ -82,22 +72,26 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudVehicle, { changePrint } from '@/api/wms/cacheline/vehicle'
|
||||
import CRUD, { presenter, header, form, crud } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import udOperation from '@crud/UD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import crudStoragevehicleinfo from '@/api/wms/basedata/master/storagevehicleinfo'
|
||||
import crudCachelineVehicle from '@/api/wms/cacheline/vehicle/cachelineVehicle'
|
||||
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation.vue'
|
||||
import crudOperation from '@crud/CRUD.operation.vue'
|
||||
import udOperation from '@crud/UD.operation.vue'
|
||||
import pagination from '@crud/Pagination.vue'
|
||||
|
||||
const defaultForm = { vehicle_uuid: null, vehicle_code: null, print_num: null, is_print: '1', create_time: null, update_time: null, print_time: null, is_active: '1', is_delete: null, create_id: null, create_name: null, update_optid: null, update_optname: null }
|
||||
const defaultForm = { vehicle_code: null, vehicle_value: null, print_num: null, is_print: null, print_time: null, product_area: null, is_active: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_id: null, update_name: null, update_time: null }
|
||||
export default {
|
||||
name: 'Vehicle',
|
||||
name: 'CachelineVehicle',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
dicts: ['IS_OR_NOT'],
|
||||
cruds() {
|
||||
return CRUD({ title: '缓存线条码', url: 'api/vehicle', idField: 'vehicle_uuid', sort: 'vehicle_uuid,desc', crudMethod: { ...crudVehicle }})
|
||||
return CRUD({
|
||||
title: '缓存线载具',
|
||||
url: 'api/cachelineVehicle',
|
||||
idField: 'vehicle_code',
|
||||
sort: 'vehicle_code,desc',
|
||||
crudMethod: { ...crudCachelineVehicle }
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -110,8 +104,14 @@ export default {
|
||||
is_print: [
|
||||
{ required: true, message: '是否打印不能为空', trigger: 'blur' }
|
||||
],
|
||||
product_area: [
|
||||
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_active: [
|
||||
{ required: true, message: '是否可用不能为空', trigger: 'blur' }
|
||||
],
|
||||
is_delete: [
|
||||
{ required: true, message: '是否删除不能为空', trigger: 'blur' }
|
||||
]
|
||||
}}
|
||||
},
|
||||
@@ -119,50 +119,6 @@ export default {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
format_is_print(is_print) {
|
||||
return is_print === '1'
|
||||
},
|
||||
format_is_active(is_active) {
|
||||
return is_active === '1'
|
||||
},
|
||||
changeEnabled(data, val) {
|
||||
let msg = '此操作将停用载具,是否继续!'
|
||||
if (val !== '1') {
|
||||
msg = '此操作将启用载具,是否继续!'
|
||||
}
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
crudVehicle.changeActive(data).then(res => {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
}).catch(() => {
|
||||
data.is_used = !data.is_used
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
changeEnabled1(data, val) {
|
||||
let msg = '此操作将停用打印,是否继续!'
|
||||
if (val !== '1') {
|
||||
msg = '此操作将启用打印,是否继续!'
|
||||
}
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
crudVehicle.changePrint(data).then(res => {
|
||||
this.crud.toQuery()
|
||||
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
|
||||
}).catch(() => {
|
||||
data.is_print = !data.is_print
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="载具选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
|
||||
<el-form-item label="载具类型">
|
||||
<el-select
|
||||
v-model="query.storagevehicle_type"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="请选择"
|
||||
class="filter-item"
|
||||
style="width: 180px;"
|
||||
@change="hand"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in storagevehicle_typeList"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="模糊搜索">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="编码、名称"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
@select="handleSelectionChange"
|
||||
@select-all="onSelectAll"
|
||||
@current-change="clickChange"
|
||||
>
|
||||
<el-table-column v-if="!isSingle" type="selection" width="55" />
|
||||
<el-table-column v-if="isSingle" label="选择" width="55">
|
||||
<template slot-scope="scope">
|
||||
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="storagevehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="one_code" label="一维码" min-width="100" show-overflow-tooltip />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import crudMaterialbase from '@/api/wms/cacheline/vehicle'
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
export default {
|
||||
name: 'OutMaterDtl',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '物料', url: 'api/storagevehicleinfo', crudMethod: { ...crudMaterialbase }, optShow: {}, query: {
|
||||
'storagevehicle_type': '05'
|
||||
}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
dicts: ['product_series'],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
isSingle: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
classes: [],
|
||||
storagevehicle_typeList: [
|
||||
{
|
||||
'value': '05',
|
||||
'label': '料箱'
|
||||
}
|
||||
],
|
||||
storagevehicle_type: '05',
|
||||
tableRadio: null,
|
||||
class_idStr: null,
|
||||
checkrow: null,
|
||||
rows: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
clickChange(item) {
|
||||
this.tableRadio = item
|
||||
},
|
||||
seriesFormat(row) {
|
||||
return this.dict.label.product_series[row.product_series]
|
||||
},
|
||||
open() {
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
} else {
|
||||
this.checkrow = row
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
// 处理单选
|
||||
if (this.isSingle && this.tableRadio) {
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged2', this.tableRadio)
|
||||
return
|
||||
}
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料')
|
||||
return
|
||||
}
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged2', this.rows)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,391 +0,0 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
|
||||
<el-form-item label="模糊查询">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
size="mini"
|
||||
placeholder="输入载具编码"
|
||||
prefix-icon="el-icon-search"
|
||||
class="filter-item"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="缓存线">
|
||||
<el-select
|
||||
v-model="query.extdevice_code"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="缓存线"
|
||||
class="filter-item"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.ST_CACHELINE_EXTDEVICE_CODE"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
<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="800px"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="缓存线位置标识" prop="position_uuid">
|
||||
<el-input v-model="form.position_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缓存线位置编码" prop="position_code">
|
||||
<el-input v-model="form.position_code" disabled style="width: 200px; " />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缓存线位置编码" prop="position_name">
|
||||
<el-input v-model="form.position_name" disabled style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="载具库存标识" prop="vehmaterial_uuid">
|
||||
<el-input v-model="form.vehmaterial_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false"label="缓存线位置标识" prop="position_uuid">
|
||||
<el-input v-model="form.position_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="载具标识" prop="vehicle_uuid">
|
||||
<el-input v-model="form.vehicle_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="载具编码" prop="vehicle_code">
|
||||
<el-input
|
||||
v-model="form.vehicle_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="vehicleShow=true"
|
||||
@clear="form.vehicle_code='',form.vehicle_uuid=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="载具状态" prop="vehicle_status">
|
||||
<el-select v-model="form.vehicle_status" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in dict.IF_WCS_VehicleStatus"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="缓存线编码" prop="extdevice_code">
|
||||
<el-select v-model="form.extdevice_code" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in dict.ST_CACHELINE_EXTDEVICE_CODE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="异常类型" prop="err_type">
|
||||
<el-select v-model="form.err_type" filterable placeholder="请选择" style="width: 200px;">
|
||||
<el-option
|
||||
v-for="item in dict.ERROE_TYPE"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料工单标识" prop="produceorder_uuid">
|
||||
<el-input v-model="form.produceorder_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料工单编码" prop="produceorder_code">
|
||||
<el-input v-model="form.produceorder_code" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="工序标识" prop="workprocedure_uuid">
|
||||
<el-input v-model="form.workprocedure_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序编号" prop="workprocedure_code">
|
||||
<el-input
|
||||
v-model="form.workprocedure_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="workProceDureShow=true"
|
||||
@clear="form.workprocedure_uuid='',form.workprocedure_code,form.workprocedure_name=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工序名称" prop="workprocedure_name">
|
||||
<el-input v-model="form.workprocedure_name" disabled style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item v-if="false" label="物料标识" prop="material_uuid">
|
||||
<el-input v-model="form.material_uuid" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="物料" prop="material_code">
|
||||
<el-input
|
||||
v-model="form.material_code"
|
||||
style="width: 200px;"
|
||||
clearable
|
||||
@focus="materialShow=true"
|
||||
@clear="form.material_uuid='',form.material_code=''"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="料箱物料数量" prop="quantity">
|
||||
<el-input v-model="form.quantity" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="料箱物料重量" prop="weight">
|
||||
<el-input v-model="form.weight" style="width: 200px;" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</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>
|
||||
</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-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" prop="position_uuid" label="缓存线位置标识" />
|
||||
<el-table-column prop="position_code" label="缓存线位置编码" width="120px" />
|
||||
<el-table-column prop="position_name" label="缓存线位置名字" width="120px" />
|
||||
<el-table-column prop="positionorder_no" label="位置顺序号" />
|
||||
<el-table-column v-if="false" prop="device_uuid" label="缓存线标识" />
|
||||
<el-table-column prop="extdevice_code" label="缓存线编码" />
|
||||
<el-table-column prop="device_name" label="缓存线名字" />
|
||||
<el-table-column prop="layer_num" label="缓存线层数" />
|
||||
<el-table-column prop="priority_layer_no" label="优先层顺序" />
|
||||
<el-table-column prop="order_no" label="料箱顺序号" width="100px" />
|
||||
<el-table-column v-if="false" prop="vehicle_uuid" label="载具标识" />
|
||||
<el-table-column prop="vehicle_code" label="载具编码" />
|
||||
<el-table-column prop="vehicle_status" label="载具状态">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.IF_WCS_VehicleStatus[scope.row.vehicle_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="extdevice_code" label="缓存线编码">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.ST_CACHELINE_EXTDEVICE_CODE[scope.row.extdevice_code] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="err_type" label="异常类型">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.ERROE_TYPE[scope.row.err_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="produceorder_uuid" label="物料工单标识" />
|
||||
<el-table-column prop="produceorder_code" label="物料工单编码" width="100px" />
|
||||
<el-table-column v-if="false" prop="workprocedure_uuid" label="工序标识" />
|
||||
<el-table-column prop="workprocedure_code" label="工序编号" />
|
||||
<el-table-column prop="workprocedure_name" label="工序名称" />
|
||||
<el-table-column v-if="false" prop="material_uuid" label="物料标识" />
|
||||
<el-table-column prop="material_code" label="物料" />
|
||||
<el-table-column prop="quantity" label="料箱物料数量"width="100px" />
|
||||
<el-table-column prop="weight" label="料箱物料重量"width="100px" />
|
||||
<el-table-column prop="create_time" label="创建时间" width="150px" />
|
||||
<el-table-column prop="update_time" label="更新时间" width="150px" />
|
||||
<el-table-column v-if="false" prop="is_active" label="是否可用" />
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
<VehicleDtl :dialog-show.sync="vehicleShow" @tableChanged2="vehicleChange" />
|
||||
<!--<OutMaterDtl :dialog-show.sync="materialShow" @tableChanged2="tableChanged2" />-->
|
||||
<WorkProcedureDtl :dialog-show.sync="workProceDureShow" @tableChanged2="WorkProceDureChanged" />
|
||||
<OutMaterDtl
|
||||
:dialog-show.sync="materialShow"
|
||||
:is-single="true"
|
||||
:mater-opt-code="materType"
|
||||
@setMaterValue="tableChanged2"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudVehilematerial from '@/api/wms/cacheline/vehilematerial'
|
||||
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'
|
||||
import pagination from '@crud/Pagination'
|
||||
import WorkProcedureDtl from '@/views/wms/cacheline/vehiclematerial/workProceDureDialog'
|
||||
import VehicleDtl from '@/views/wms/cacheline/vehiclematerial/VehicleDialog'
|
||||
import OutMaterDtl from '@/views/wms/pub/MaterDialog'
|
||||
import WorkProcedure from '@/views/wms/basedata/pdm/workProcedure/index'
|
||||
|
||||
const defaultForm = {
|
||||
vehmaterial_uuid: null,
|
||||
vehicle_uuid: null,
|
||||
vehicle_code: null,
|
||||
vehicle_status: null,
|
||||
extdevice_code: 'HCX01',
|
||||
err_type: null,
|
||||
produceorder_uuid: null,
|
||||
produceorder_code: null,
|
||||
workprocedure_uuid: null,
|
||||
workprocedure_code: null,
|
||||
workprocedure_name: null,
|
||||
material_uuid: null,
|
||||
quantity: null,
|
||||
weight: null,
|
||||
create_time: null,
|
||||
update_time: null,
|
||||
is_active: null,
|
||||
is_delete: null
|
||||
}
|
||||
export default {
|
||||
name: 'Vehilematerial',
|
||||
components: { WorkProcedure, pagination, crudOperation, rrOperation, udOperation, VehicleDtl, OutMaterDtl, WorkProcedureDtl },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
dicts: ['IF_WCS_VehicleStatus', 'ST_CACHELINE_EXTDEVICE_CODE', 'ERROE_TYPE'],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '缓存线载具物料',
|
||||
url: 'api/vehilematerial',
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: true,
|
||||
del: false,
|
||||
download: false,
|
||||
reset: true
|
||||
},
|
||||
idField: 'vehmaterial_uuid',
|
||||
sort: 'vehmaterial_uuid,desc',
|
||||
crudMethod: { ...crudVehilematerial }
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
materType: '01',
|
||||
vehicleShow: false,
|
||||
workProceDureShow: false,
|
||||
materialShow: false,
|
||||
permission: {},
|
||||
rules: {
|
||||
extdevice_code: [
|
||||
{ required: true, message: '缓存线编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
err_type: [
|
||||
{ required: true, message: '异常类型不能为空', trigger: 'blur' }
|
||||
],
|
||||
quantity: [
|
||||
{ required: true, message: '料箱物料数量不能为空', trigger: 'blur' }
|
||||
],
|
||||
weight: [
|
||||
{ required: true, message: '料箱物料重量不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
vehicleChange(row) {
|
||||
this.form.vehicle_uuid = row.storagevehicle_id
|
||||
this.form.vehicle_code = row.storagevehicle_code
|
||||
},
|
||||
tableChanged2(row) {
|
||||
this.form.material_uuid = row.material_id
|
||||
this.form.material_code = row.material_code
|
||||
},
|
||||
WorkProceDureChanged(row) {
|
||||
this.form.workprocedure_uuid = row.workprocedure_id
|
||||
this.form.workprocedure_code = row.workprocedure_code
|
||||
this.form.workprocedure_name = row.workprocedure_name
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -1,156 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="工序选择"
|
||||
append-to-body
|
||||
:visible.sync="dialogVisible"
|
||||
destroy-on-close
|
||||
width="1000px"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form
|
||||
:inline="true"
|
||||
class="demo-form-inline"
|
||||
label-position="right"
|
||||
label-width="80px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<el-form-item label="模糊搜索">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="编码、名称"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
border
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
@select="handleSelectionChange"
|
||||
@select-all="onSelectAll"
|
||||
@current-change="clickChange"
|
||||
>
|
||||
<el-table-column v-if="!isSingle" type="selection" width="55" />
|
||||
<el-table-column v-if="isSingle" label="选择" width="55">
|
||||
<template slot-scope="scope">
|
||||
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" prop="workprocedure_id" label="工序标识" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="workprocedure_code" label="工序编码" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="workprocedure_name" label="工序名称" min-width="100" show-overflow-tooltip />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="submit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
|
||||
import CRUD, { header, presenter } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
export default {
|
||||
name: 'OutMaterDtl',
|
||||
components: { rrOperation, pagination },
|
||||
cruds() {
|
||||
return CRUD({ title: '物料', url: 'api/workProcedure', crudMethod: { ...crudWorkProcedure }, optShow: {}})
|
||||
},
|
||||
mixins: [presenter(), header()],
|
||||
dicts: ['product_series'],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
isSingle: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
materOptCode: {
|
||||
type: String,
|
||||
default: '00'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
classes: [],
|
||||
tableRadio: null,
|
||||
class_idStr: null,
|
||||
checkrow: null,
|
||||
rows: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
clickChange(item) {
|
||||
this.tableRadio = item
|
||||
},
|
||||
seriesFormat(row) {
|
||||
return this.dict.label.product_series[row.product_series]
|
||||
},
|
||||
open() {
|
||||
},
|
||||
handleSelectionChange(val, row) {
|
||||
if (val.length > 1) {
|
||||
this.$refs.table.clearSelection()
|
||||
this.$refs.table.toggleRowSelection(val.pop())
|
||||
} else {
|
||||
this.checkrow = row
|
||||
}
|
||||
},
|
||||
onSelectAll() {
|
||||
this.$refs.table.clearSelection()
|
||||
},
|
||||
close() {
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
},
|
||||
submit() {
|
||||
// 处理单选
|
||||
if (this.isSingle && this.tableRadio) {
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged2', this.tableRadio)
|
||||
return
|
||||
}
|
||||
this.rows = this.$refs.table.selection
|
||||
if (this.rows.length <= 0) {
|
||||
this.$message('请先勾选物料')
|
||||
return
|
||||
}
|
||||
this.crud.resetQuery(false)
|
||||
this.$emit('update:dialogShow', false)
|
||||
this.$emit('tableChanged2', this.rows)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style rel="stylesheet/scss" lang="scss" scoped>
|
||||
::v-deep .el-dialog__body {
|
||||
padding-top: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
146
mes/qd/src/views/wms/sch/region/index.vue
Normal file
146
mes/qd/src/views/wms/sch/region/index.vue
Normal file
@@ -0,0 +1,146 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!--工具栏-->
|
||||
<div class="head-container">
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!-- 搜索 -->
|
||||
<label class="el-form-item-label">模糊搜索</label>
|
||||
<el-input
|
||||
v-model="query.region_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="550px"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
|
||||
<el-form-item label="区域编码" prop="region_code">
|
||||
<el-input v-model="form.region_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="区域名称" prop="region_name">
|
||||
<el-input v-model="form.region_name" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位类型说明">
|
||||
<el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="点位状态说明">
|
||||
<el-input v-model="form.point_status_explain" type="textarea" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" type="textarea" 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>
|
||||
</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-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="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
|
||||
<el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
|
||||
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',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 v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudRegion from '@/api/wms/sch/region'
|
||||
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'
|
||||
import pagination from '@crud/Pagination'
|
||||
|
||||
const defaultForm = {
|
||||
region_code: null,
|
||||
region_name: null,
|
||||
point_type_explain: null,
|
||||
point_status_explain: null,
|
||||
remark: null,
|
||||
create_id: null,
|
||||
create_name: null,
|
||||
create_time: null,
|
||||
update_optid: null,
|
||||
update_optname: null,
|
||||
update_time: null
|
||||
}
|
||||
export default {
|
||||
name: 'Region',
|
||||
components: { pagination, crudOperation, rrOperation, udOperation },
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: '区域管理',
|
||||
url: 'api/region',
|
||||
idField: 'region_code',
|
||||
sort: 'region_code,desc',
|
||||
crudMethod: { ...crudRegion },
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: false,
|
||||
del: false,
|
||||
download: false,
|
||||
reset: true
|
||||
}
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
permission: {},
|
||||
rules: {
|
||||
region_code: [
|
||||
{ required: true, message: '区域编码不能为空', trigger: 'blur' }
|
||||
],
|
||||
region_name: [
|
||||
{ required: true, message: '区域名称不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 钩子:在获取表格数据之前执行,false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
Reference in New Issue
Block a user