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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-24 16:58:01 +08:00
parent f9f66b0528 3a09875f8d
commit a1e194462b
1581 changed files with 170621 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mes/qd/src/api/wms/cacheline/region/cachelineRegionRelation.js Normal file
View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/cachelineRegionRelation',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/cachelineRegionRelation/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/cachelineRegionRelation',
method: 'put',
data
})
}
export default { add, edit, del }

24
mes/qd/src/views/tools/codeGen/codeDetail.vue
View File

@@ -11,7 +11,7 @@
<el-input
v-model="query.label"
clearable
size="small"
size="mini"
placeholder="输入编码标签查询"
style="width: 200px;"
class="filter-item"
@@ -29,7 +29,7 @@
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" @change="changeType">
<el-option
@@ -42,7 +42,7 @@
</el-form-item>
<div v-if="form.type === '01' || form.type === '03'">
<el-form-item label="初始值" prop="init_value">
<el-input v-model="form.init_value" style="width: 370px;" />
<el-input v-model="form.initValue" style="width: 370px;" />
</el-form-item>
</div>
<div v-if="form.type === '02'">
@@ -61,12 +61,12 @@
<el-input v-model="form.length" style="width: 370px;" />
</el-form-item>
<el-form-item label="最大值" prop="max_value">
<el-input v-model="form.max_value" style="width: 370px;" />
<el-input v-model="form.maxValue" style="width: 370px;" />
</el-form-item>
</div>
<el-form-item label="排序" prop="sort_num">
<el-input-number
v-model.number="form.sort_num"
v-model.number="form.sortNum"
:min="0"
:max="999"
controls-position="right"
@@ -92,8 +92,8 @@
{{ query.dictName }}
</el-table-column>
<el-table-column prop="type" label="类型" :formatter="typeFormate" />
<el-table-column prop="init_value" label="初始值" />
<el-table-column prop="current_value" label="当前值" />
<el-table-column prop="initValue" label="初始值" />
<el-table-column prop="currentValue" label="当前值" />
<el-table-column
v-permission="['admin','dict:edit','dict:del']"
label="操作"
@@ -125,12 +125,12 @@ import udOperation from '@crud/UD.operation'
const defaultForm = {
id: null,
type: '01',
init_value: null,
initValue: null,
format: null,
step: null,
fillchar: null,
length: null,
sort_num: 0
sortNum: 0
}
export default {
@@ -174,16 +174,16 @@ export default {
type: [
{ required: true, message: '请输入编码标签', trigger: 'blur' }
],
init_value: [
initValue: [
{ required: true, message: '请输入初始值', trigger: 'blur' }
],
sort_num: [
sortNum: [
{ required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
],
format: [
{ required: true, message: '请输入日期格式', trigger: 'blur' }
],
max_value: [
maxValue: [
{ required: true, message: '请输入最大值', trigger: 'blur' }
]
},

17
mes/qd/src/views/tools/codeGen/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码" prop="name">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
@@ -23,7 +23,7 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable size="small" placeholder="输入编码或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.blurry" clearable size="mini" placeholder="输入编码或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation />
</div>
<crudOperation :permission="permission" />
@@ -31,10 +31,10 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column type="selection" width="55" />
<el-table-column :show-overflow-tooltip="true" prop="code" width="80" label="编码" />
<el-table-column :show-overflow-tooltip="true" prop="name" width="100" label="名称" />
<el-table-column :show-overflow-tooltip="true" prop="demo" width="150" label="测试值" />
<el-table-column :show-overflow-tooltip="true" prop="remark" label="备注" />
<el-table-column show-overflow-tooltip prop="code" width="80" label="编码" />
<el-table-column show-overflow-tooltip prop="name" width="100" label="名称" />
<el-table-column show-overflow-tooltip prop="demo" width="150" label="测试值" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -81,10 +81,10 @@ import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = { id: null, name: null, description: null, codeGenDetails: [] }
const defaultForm = { id: null, name: null, description: null, codeGenDetails: [], code: null }
export default {
name: 'Dict',
name: 'GenCode',
components: { crudOperation, pagination, rrOperation, udOperation, codeGenDetail },
cruds() {
return [
@@ -131,6 +131,7 @@ export default {
if (val) {
this.$refs.codeGenDetail.query.dictName = val.code
this.$refs.codeGenDetail.query.id = val.id
this.$refs.codeGenDetail.form.codeRuleId = val.id
this.$refs.codeGenDetail.dictId = val.id
this.$refs.codeGenDetail.crud.toQuery()
}

2
mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue
View File

@@ -140,7 +140,7 @@
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
width="50px"
width="100px"
align="center"
fixed="right"
>

82
mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue
View File

@@ -2,17 +2,43 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
: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="输入工序编码或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<rrOperation />
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<el-input
v-model="query.search"
clearable
style="width: 300px"
size="mini"
placeholder="输入工序编码或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation />
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
@@ -26,6 +52,20 @@
<el-form-item v-if="false" label="工序标识" prop="workprocedure_id">
<el-input v-model="form.workprocedure_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工序编码" prop="workprocedure_code">
<el-input v-model="form.workprocedure_code" style="width: 370px;" />
</el-form-item>
@@ -149,12 +189,27 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
workprocedure_id: null, workprocedure_code: null, workprocedure_name: null, worksection_type_scode: null, burst_type_scode: null, is_keyworkprocedure: '1', is_first: '1', is_used: '1', remark: null, create_id: null, create_name: null, create_time: null, is_delete: null, update_optid: null, update_optname: null, update_time: null, ext_id: null, sysdeptid: null, syscompanyid: null
workprocedure_id: null,
product_area: 'A1',
workprocedure_code: null,
workprocedure_name: null,
worksection_type_scode: null,
burst_type_scode: null,
is_keyworkprocedure: '1',
is_first: '1',
is_used: '1',
remark: null,
create_id: null,
create_name: null,
create_time: null,
update_id: null,
update_name: null,
update_time: null
}
export default {
name: 'WorkProcedure',
components: { pagination, crudOperation, rrOperation, udOperation },
dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE'],
dicts: ['PDM_BI_SECTION', 'PDM_BI_BURSTTYPE', 'product_area'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -163,6 +218,9 @@ export default {
idField: 'workprocedure_id',
sort: 'workprocedure_id,desc',
crudMethod: { ...crudWorkProcedure },
query: {
product_area: 'A1'
},
optShow: {
add: true,
edit: true,

161
mes/qd/src/views/wms/cacheline/position/index.vue
View File

@@ -2,49 +2,143 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
size="small"
placeholder="请输入位置编码或名称"
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="710px">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="缓存线位置编码" prop="position_code">
<el-input v-model="form.position_code" style="width: 370px;" />
<el-input v-model="form.position_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="缓存线位置名字" prop="position_name">
<el-input v-model="form.position_name" style="width: 370px;" />
<el-input v-model="form.position_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="位置顺序号" prop="positionOrder_no">
<el-input v-model="form.positionOrder_no" style="width: 370px;" />
<el-input v-model="form.positionOrder_no" style="width: 200px;" />
</el-form-item>
<el-form-item label="缓存线编码" prop="cacheLine_code">
<el-input v-model="form.cacheLine_code" style="width: 370px;" />
<el-form-item label="缓存线编码" prop="cacheline_code">
<el-input v-model="form.cacheline_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="缓存线层数" prop="layer_num">
<el-input v-model="form.layer_num" style="width: 370px;" />
<el-input v-model="form.layer_num" style="width: 200px;" />
</el-form-item>
<el-form-item label="优先层顺序" prop="priority_layer_no">
<el-input v-model="form.priority_layer_no" style="width: 370px;" />
<el-input v-model="form.priority_layer_no" style="width: 200px;" />
</el-form-item>
<el-form-item label="料箱展示顺序号" prop="order_no">
<el-input v-model="form.order_no" style="width: 370px;" />
<el-input v-model="form.order_no" style="width: 200px;" />
</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-input v-model="form.vehicle_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="是否空位" prop="is_empty">
<el-input v-model="form.is_empty" style="width: 370px;" />
<el-select
v-model="form.is_empty"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否展示" prop="is_show">
<el-input v-model="form.is_show" style="width: 370px;" />
<el-select
v-model="form.is_show"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否可用" prop="is_active">
<el-input v-model="form.is_active" style="width: 370px;" />
<el-select
v-model="form.is_active"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否删除" prop="is_delete">
<el-input v-model="form.is_delete" style="width: 370px;" />
<el-select
v-model="form.is_delete"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -58,7 +152,7 @@
<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="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"/>
@@ -67,7 +161,6 @@
<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
@@ -85,7 +178,7 @@
<script>
import crudCachelinePosition from '@/api/wms/cacheline/position/cachelinePosition'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
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'
@@ -95,23 +188,33 @@ const defaultForm = {
position_code: null,
position_name: null,
positionOrder_no: null,
cacheLine_code: 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
product_area: 'A1',
is_empty: '1',
is_show: '1',
is_active: '1',
is_delete: '0'
}
export default {
name: 'CachelinePosition',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['product_area', 'IS_OR_NOT'],
cruds() {
return CRUD({ title: '缓存线位置', url: 'api/cachelinePosition', idField: 'position_code', sort: 'position_code,desc', crudMethod: { ...crudCachelinePosition }})
return CRUD({
title: '缓存线位置',
url: 'api/cachelinePosition',
idField: 'position_code',
sort: 'position_code,desc',
crudMethod: { ...crudCachelinePosition },
query: {
product_area: 'A1'
}
})
},
data() {
return {
@@ -127,7 +230,7 @@ export default {
positionOrder_no: [
{ required: true, message: '位置顺序号不能为空', trigger: 'blur' }
],
cacheLine_code: [
cacheline_code: [
{ required: true, message: '缓存线编码不能为空', trigger: 'blur' }
],
layer_num: [

136
mes/qd/src/views/wms/cacheline/region/index.vue Normal file
View File

@@ -0,0 +1,136 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
size="small"
placeholder="请输入位置编码或名称"
class="filter-item"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="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="cacheline_code">
<el-input v-model="form.cacheline_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否可用" prop="is_active">
<el-select
v-model="form.is_active"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</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="region_code" label="区域编码" />
<el-table-column prop="cacheline_code" label="缓存线编码" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_time" label="更新时间" />
<el-table-column prop="is_active" label="是否可用" >
<template slot-scope="scop">
{{scop.row.is_active ? '是' : '否'}}
</template>
</el-table-column>
<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 crudCachelineRegionRelation from '@/api/wms/cacheline/region/cachelineRegionRelation'
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 = {
relation_id: null,
region_code: null,
cacheline_code: null,
create_time: null,
update_time: null,
is_active: null,
is_delete: null
}
export default {
name: 'CachelineRegionRelation',
dicts: ['IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '个缓存线区域关系', url: 'api/cachelineRegionRelation', idField: 'relation_id', sort: 'relation_id,desc', crudMethod: { ...crudCachelineRegionRelation }})
},
data() {
return {
permission: {
},
rules: {
region_code: [
{ required: true, message: '区域编码不能为空', trigger: 'blur' }
],
cacheline_code: [
{ 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>

105
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -10,6 +10,23 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- 搜索 -->
<el-form-item label="工单编号">
<el-input
@@ -180,6 +197,20 @@
width="1200px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="所属工序" prop="workprocedure_id">
<el-select
v-model="form.workprocedure_id"
@@ -324,7 +355,7 @@
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="shift_type_scode" label="班次类型" >
<el-table-column prop="shift_type_scode" label="班次类型">
<template slot-scope="scope">
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
@@ -333,17 +364,17 @@
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="person_name" label="操作员" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip/>
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip/>
<el-table-column prop="material_weight" label="物料单重" width="100"/>
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip/>
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip/>
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip/>
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip/>
<el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip/>
<el-table-column prop="person_name" label="生产人员" />
<el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
<el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
<el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip />
<el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
@@ -354,27 +385,27 @@
{{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
</template>
</el-table-column>
<el-table-column prop="is_needmove" label="是否搬运" >
<el-table-column prop="is_needmove" label="是否搬运">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
</template>
</el-table-column>
<el-table-column prop="create_type" label="创建类型">
<el-table-column prop="create_type" label="创建类型" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
</template>
</el-table-column>
<el-table-column prop="is_error" label="是否异常" >
<el-table-column prop="is_error" label="是否异常">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_error] }}
</template>
</el-table-column>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
<el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip/>
<el-table-column prop="create_name" label="创建人" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip />
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip/>
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip/>
<el-table-column prop="update_name" label="修改人" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -422,12 +453,13 @@ const defaultForm = {
workorder_code: null,
shift_type_scode: null,
workprocedure_id: null,
product_area: null,
product_area: 'A1',
plan_qty: null,
real_qty: null,
person_real_qty: null,
dq_real_qty: null,
material_id: null,
material_code: null,
material_weight: null,
planproducestart_date: null,
planproduceend_date: null,
@@ -455,10 +487,10 @@ export default {
name: 'Produceshiftorder',
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, UploadDialog, ReplaceDeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'],
cruds() {
return CRUD({
title: '工单', url: 'api/produceWorkorder', idField: 'produceorder_id', sort: 'produceorder_id,desc',
title: '工单', url: 'api/produceWorkorder', idField: 'workorder_id', sort: 'workorder_id,desc',
optShow: {
add: true,
edit: false,
@@ -468,6 +500,7 @@ export default {
},
query: {
order_status: '-1',
product_area: 'A1',
is_error: '0'
},
crudMethod: { ...crudProduceshiftorder }
@@ -670,13 +703,13 @@ export default {
if (length > 1) {
var flag = false
for (let i = 0; i < rows.length; i++) {
if (rows[i].order_status !== '00' || rows[i].device_id === '') {
if (rows[i].workorder_status === '5') {
flag = true
break
}
}
return flag
} else if (length === 1 && rows[0].order_status === '00' && rows[0].device_id !== '') {
} else if (length === 1 && rows[0].workorder_status !== '5') {
return false
} else {
return true
@@ -689,13 +722,13 @@ export default {
if (length > 1) {
var flag = false
for (let i = 0; i < rows.length; i++) {
if (rows[i].order_status === '04') {
if (rows[i].workorder_status === '5') {
flag = true
break
}
}
return flag
} else if (length === 1 && rows[0].order_status !== '04') {
} else if (length === 1 && rows[0].workorder_status !== '5') {
return false
} else {
return true
@@ -716,16 +749,16 @@ export default {
},
// 下发
submits(rows) {
var i = Number(0)
var orders = []
console.log(rows)
rows.forEach((item) => {
var produceorder_id = item.produceorder_id
crudProduceshiftorder.submits({ produceorder_id: produceorder_id }).then(res => {
i = i + 1
if (i === rows.length) {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}
})
debugger
orders.push(item.workprocedure_id)
})
debugger
crudProduceshiftorder.submits(orders).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
add() {
@@ -739,7 +772,7 @@ export default {
},
[CRUD.HOOK.beforeToAdd]() {
this.initDataPlan()
},
}
// [CRUD.HOOK.afterToEdit]() {
// const editForm1 = JSON.parse(JSON.stringify(this.form))
// this.getNotWorkDeviceByWorkproceduceId(editForm1.workprocedure_id)

105
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -3,26 +3,51 @@
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">模糊搜索</label>
<el-input
v-model="query.search"
clearable
size="small"
placeholder="请输入设备编码或名称"
style="width: 220px;"
class="filter-item"
/>
<label class="el-form-item-label">所属工序</label>
<el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
<el-option
v-for="item in workList"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
<rrOperation :crud="crud" />
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
size="small"
placeholder="请输入设备编码或名称"
class="filter-item"
/>
</el-form-item>
<el-form-item label="所属工序">
<el-select v-model="query.workprocedure_id" filterable clearable size="small" placeholder="所属工序" class="filter-item" style="width: 220px" @change="changeHeader(query.search, query.workprocedure_id)">
<el-option
v-for="item in workList"
:key="item.workprocedure_id"
:label="item.workprocedure_name"
:value="item.workprocedure_id"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
@@ -57,23 +82,34 @@
:title="crud.status.title"
width="1200px">
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="设备编码" prop="material_code">
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="设备编码" prop="device_code">
<el-input
v-model="form.device_code"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item label="设备名称" prop="material_code">
<el-form-item label="设备名称" prop="device_name">
<el-input
v-model="form.device_name"
style="width: 200px;"
clearable
/>
</el-form-item>
<el-form-item label="生产区域" prop="product_area">
<el-input v-model="form.product_area" style="width: 200px;" />
</el-form-item>
<el-form-item label="设备编码2">
<el-input v-model="form.device_code2" style="width: 200px;" />
</el-form-item>
@@ -169,7 +205,7 @@ import CopyDialog from '@/views/wms/pdm/device/CopyDialog'
const defaultForm = {
device_code: null,
device_name: null,
product_area: null,
product_area: 'A1',
workprocedure_id: null,
ext_code: null,
material_id: null,
@@ -182,7 +218,7 @@ const defaultForm = {
deviceinitinstor_qty: null,
deviceinstor_qty: null,
deviceoutstor_qty: null,
is_artificial: null,
is_artificial: '0',
remark: null,
create_id: null,
create_name: null,
@@ -196,9 +232,16 @@ export default {
name: 'Device',
components: { pagination, crudOperation, rrOperation, udOperation, DeviceItemDialog, CopyDialog, DeviceInfoDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['is_used', 'IS_OR_NOT'],
dicts: ['is_used', 'IS_OR_NOT', 'product_area'],
cruds() {
return CRUD({ title: '生产设备', url: 'api/device', idField: 'device_code', sort: 'device_code,desc',
return CRUD({
title: '生产设备',
url: 'api/device',
idField: 'device_code',
sort: 'device_code,desc',
query: {
product_area: 'A1'
},
optShow: {
add: true,
edit: false,
@@ -206,7 +249,8 @@ export default {
reset: true,
download: false
},
crudMethod: { ...crudDevice }})
crudMethod: { ...crudDevice }
})
},
data() {
return {
@@ -296,6 +340,7 @@ export default {
},
getWorkprocedure() { // 获取工序下拉框
crudDevice.getWorkprocedure().then(res => {
console.log(res)
this.workList = res
})
},

135
mes/qd/src/views/wms/sch/point/index.vue
View File

@@ -10,6 +10,23 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="模糊搜索">
<el-input
v-model="query.name"
@@ -202,6 +219,20 @@
width="540px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
@@ -219,32 +250,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="上一区域" prop="pre_region_code">
<el-select
v-model="form.pre_region_code"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="下一区域" prop="next_region_code">
<el-select
v-model="form.next_region_code"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
@@ -269,9 +274,9 @@
</el-form-item>
<el-form-item label="绑定设备" prop="device_code">
<el-select
v-model="form.device_code"
clearable
filterable
v-model="form.device_code"
placeholder="请选择"
style="width: 370px;"
>
@@ -282,22 +287,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位位置" prop="point_location">
<el-select
v-model="form.point_location"
clearable
size="mini"
placeholder="点位位置"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.point_location"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
@@ -331,39 +320,19 @@
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="已放载具类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
<el-option
v-for="item in dict.storagevehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="可放载具类型" prop="can_vehicle_types">
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" style="width: 370px;">
<el-option
v-for="item in dict.storagevehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">-->
<!-- <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />-->
<!-- </el-form-item>-->
<el-form-item v-if="form.point_status === '3'" label="物料来源">
<!-- <el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">-->
<!-- <el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />-->
<!-- </el-form-item>-->
<el-form-item v-if="form.point_status === '2'" label="物料来源">
<el-radio-group v-model="choose" size="mini">
<el-radio-button label="物料" />
<el-radio-button label="工单" />
</el-radio-group>
</el-form-item>
<el-form-item v-if="false" label="物料名称" prop="vehicle_code">
<el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
<el-input v-model="form.material_id" suffix-icon="el-icon-date" clearable style="width: 370px;" @focus="getMaterial" />
</el-form-item>
<el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
<el-form-item v-if="form.point_status === '2'" label="物料名称" prop="vehicle_code">
<el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
</el-form-item>
<el-form-item label="备注">
@@ -392,11 +361,6 @@
</el-table-column>
<el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_location" label="位置">
<template slot-scope="scope">
{{ scope.row.point_location ? '下' : '上' }}
</template>
</el-table-column>
<el-table-column prop="pre_region_name" label="上一区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="next_region_name" label="下一区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
@@ -408,7 +372,7 @@
{{ dict.label.storagevehicle_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="120" />
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
@@ -459,7 +423,7 @@ const defaultForm = {
point_id: null,
point_code: null,
point_name: null,
product_area: null,
product_area: 'A1',
region_code: null,
pre_region_code: null,
next_region_code: null,
@@ -469,8 +433,6 @@ const defaultForm = {
material_id: null,
material_code: null,
device_code: null,
can_vehicle_type: null,
can_vehicle_types: null,
vehicle_max_qty: null,
vehicle_type: null,
vehicle_code: null,
@@ -499,7 +461,7 @@ const defaultForm = {
}
export default {
name: 'Point',
dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location'],
dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location', 'product_area'],
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -514,7 +476,10 @@ export default {
download: false,
reset: true
},
crudMethod: { ...crudPoint }
crudMethod: { ...crudPoint },
query: {
product_area: 'A1'
}
})
},
@@ -546,19 +511,9 @@ export default {
region_code: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
],
pre_region_code: [
{ required: true, message: '上一区域类型不能为空', trigger: 'blur' }
],
next_region_code: [
{ required: true, message: '下一区域类型不能为空', trigger: 'blur' }
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
],
can_vehicle_types: [
{ required: true, message: '载具存放类型不能为空', trigger: 'blur' }
]
}
}
},

91
mes/qd/src/views/wms/sch/region/index.vue
View File

@@ -3,17 +3,41 @@
<!--工具栏-->
<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" />
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="crud.toQuery()"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="编码/名称">
<el-input
v-model="query.region_code"
clearable
placeholder="输入编码或名称"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
@@ -26,12 +50,40 @@
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="生产区域" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.product_area"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<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="是否合并任务" prop="merge">
<el-select
v-model="form.merge"
placeholder=""
style="width: 370px"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型说明">
<el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
</el-form-item>
@@ -56,13 +108,18 @@
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_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="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="merge" label="是否合并任务" :min-width="flexWidth('merge',crud.data,'是否合并任务')">
<template slot-scope="scope">
{{scope.row.merge ? '是' : '否'}}
</template>
</el-table-column>
<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="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">
@@ -90,8 +147,10 @@ import pagination from '@crud/Pagination'
const defaultForm = {
region_code: null,
region_name: null,
product_area: 'A1',
point_type_explain: null,
point_status_explain: null,
merge: '1',
remark: null,
create_id: null,
create_name: null,
@@ -102,6 +161,7 @@ const defaultForm = {
}
export default {
name: 'Region',
dicts: ['product_area', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -111,6 +171,9 @@ export default {
idField: 'region_code',
sort: 'region_code,desc',
crudMethod: { ...crudRegion },
query: {
product_area: 'A1'
},
optShow: {
add: true,
edit: false,

38
mes/qd/src/views/wms/sch/task/index.vue
View File

@@ -10,6 +10,23 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务号">
<label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
<el-input
@@ -117,13 +134,13 @@
<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 >
<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] }}
{{ dict.label.SCH_TASK_TYPE_DTL[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="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip >
<el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.task_finished_type[scope.row.finished_type] }}
</template>
@@ -132,7 +149,7 @@
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="product_area" 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="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
@@ -141,12 +158,10 @@
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
<el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="point_code3" label="等待点" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point3_region_name" label="等待点区域" 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_code4" label="点位4" min-width="100" show-overflow-tooltip />
<el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_code3" label="返回点" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="返回点区域" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />-->
<el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
<el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
@@ -214,7 +229,7 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
export default {
name: 'Task',
dicts: ['acs_task_type', 'vehicle_type', 'task_finished_type'],
dicts: ['SCH_TASK_TYPE_DTL', 'vehicle_type', 'task_finished_type', 'product_area'],
components: {
pagination, crudOperation, rrOperation, Treeselect, udOperation
},
@@ -233,6 +248,7 @@ export default {
next_point_code: '',
task_type: '',
finished_type: '',
product_area: 'A1',
task_status: ''
},
optShow: {