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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-09 18:16:10 +08:00
parent 3893c034a2
commit a36889dcd1
29 changed files with 2614 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-ui/src/views/system/dict/dictDetail.vue
View File

@@ -37,7 +37,7 @@
</el-table-column>
<el-table-column prop="label" label="字典标签" align="center" width="100" />
<el-table-column prop="value" label="字典值" align="center" width="60" />
<el-table-column prop="dictSort" label="排序" align="center" width="45" />
<el-table-column prop="dictSort" label="排序" align="center" width="65" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" width="115px" fixed="right">
<template slot-scope="scope">
<udOperation

27
nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolpointivt.js Normal file
View File

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

286
nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue
View File

@@ -4,71 +4,190 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">点位编码</label>
<el-input v-model="query.point_code" clearable placeholder="点位编码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation :crud="crud" />
<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.point_code"
clearable
placeholder="输入点位编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-input
v-model="query.container_name"
clearable
placeholder="输入母卷号"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="满轴位状态">
<el-select
v-model="query.full_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_full_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="空轴位状态">
<el-select
v-model="query.empty_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_empty_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@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="库存状态">
<el-select
v-model="query.cool_ivt_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_cool_ivt_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch
@change="hand"
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"/>
</el-form-item>
<el-form-item label="入库时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</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="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="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="满轴位编码" prop="full_point_code">
<el-input v-model="form.full_point_code" style="width: 370px;" />
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷工单标识">
<el-input v-model="form.workorder_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷轴编码">
<el-input v-model="form.full_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位编码" prop="empty_point_code">
<el-input v-model="form.empty_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="下料区域标识">
<el-input v-model="form.region_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="库存数" prop="ivt_qty">
<el-input v-model="form.ivt_qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="计量单位标识">
<el-input v-model="form.qty_unit_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.instorage_time" style="width: 370px;" />
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
</el-form-item>
<el-form-item label="顺序号">
<el-input v-model="form.sort_seq" style="width: 370px;" />
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="是否启用">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-input v-model="form.full_point_status" style="width: 370px;" />
<el-select
v-model="form.full_point_status"
size="mini"
placeholder="满轴位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_full_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-input v-model="form.empty_point_status" style="width: 370px;" />
<el-select
v-model="form.empty_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_empty_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="库存状态" prop="cool_ivt_status">
<el-select
v-model="form.cool_ivt_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_cool_ivt_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -80,20 +199,41 @@
<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="point_code" label="点位编码" />
<el-table-column prop="cool_ivt_status" label="库存状态" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.sch_cool_ivt_status[scope.row.cool_ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="120" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编号" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="is_used" label="是否启用" >
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
<el-table-column prop="qty_unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" />
<el-table-column prop="point_location" label="位置" >
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -101,6 +241,7 @@
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-del="false"
/>
</template>
</el-table-column>
@@ -112,43 +253,48 @@
</template>
<script>
import crudStIvtCoolpointivt from './stIvtCoolpointivt'
import crudStIvtCoolpointivt from './coolpointivt'
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 = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, empty_point_status: null }
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, cool_ivt_status: null, empty_point_status: null }
export default {
name: 'StIvtCoolpointivt',
dicts: ['sch_full_point_status', 'sch_empty_point_status', 'sch_cool_ivt_status', 'is_used', 'point_location', 'product_area'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '冷却区库存', url: 'api/stIvtCoolpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudStIvtCoolpointivt }})
return CRUD({
title: '冷却区库存',
url: 'api/stIvtCoolpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
crudMethod: { ...crudStIvtCoolpointivt },
optShow: {
add: false,
edit: true,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
permission: {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
full_point_code: [
{ required: true, message: '满轴位编码不能为空', trigger: 'blur' }
],
empty_point_code: [
{ required: true, message: '空轴位编码不能为空', trigger: 'blur' }
],
ivt_qty: [
{ required: true, message: '库存数不能为空', trigger: 'blur' }
],
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
],
cool_ivt_status: [
{ required: true, message: '库存状态不能为空', trigger: 'blur' }
]
},
queryTypeOptions: [
@@ -160,6 +306,10 @@ export default {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
}
}
}

199
nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -2,49 +2,138 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<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.point_code"
clearable
placeholder="输入点位编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="满轴位状态">
<el-select
v-model="query.full_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_full_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="空轴位状态">
<el-select
v-model="query.empty_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_empty_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@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="是否启用">
<el-switch
@change="hand"
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</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="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="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="满轴位编码">
<el-input v-model="form.full_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-input v-model="form.full_point_status" style="width: 370px;" />
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="母卷轴编码">
<el-input v-model="form.full_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位编码">
<el-input v-model="form.empty_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-input v-model="form.empty_point_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" />
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="位置">
<el-input v-model="form.point_location" style="width: 370px;" />
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" />
<el-form-item label="满轴位状态" prop="full_point_status">
<el-select
v-model="form.full_point_status"
size="mini"
placeholder="满轴位状态"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_full_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-select
v-model="form.empty_point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_empty_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -57,15 +146,35 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用" >
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" />
<el-table-column prop="product_area" label="生产区域" >
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置" >
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -73,6 +182,7 @@
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-del="false"
/>
</template>
</el-table-column>
@@ -94,10 +204,24 @@ import pagination from '@crud/Pagination'
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, full_point_status: null, container_name: null, full_vehicle_code: null, empty_point_code: null, empty_point_status: null, empty_vehicle_code: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'Cutpointivt',
dicts: ['sch_full_point_status', 'sch_empty_point_status', 'product_area', 'is_used', 'point_location'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '分切区点库存', url: 'api/cutpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudCutpointivt }})
return CRUD({
title: '分切区点库存',
url: 'api/cutpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
crudMethod: { ...crudCutpointivt },
optShow: {
add: false,
edit: true,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
@@ -125,6 +249,9 @@ export default {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
}
}
}

27
nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/hotpointivt.js Normal file
View File

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

229
nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue Normal file
View File

@@ -0,0 +1,229 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<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.point_code"
clearable
placeholder="输入点位编码"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@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="是否启用">
<el-switch
@change="hand"
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"/>
</el-form-item>
<el-form-item label="入箱时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</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="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.sch_point_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="温度">
<el-input v-model="form.temperature" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
</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="point_code" label="点位编码" />
<el-table-column prop="point_status" label="点位状态" >
<template slot-scope="scope">
{{ dict.label.sch_point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用" >
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
<el-table-column prop="instorage_time" label="入箱时间" />
<el-table-column prop="product_area" label="生产区域" >
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="group_name" label="组别" />
<el-table-column prop="point_location" label="位置" >
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-del="false"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudHotpointivt from './hotpointivt'
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 = { ivt_id: null, point_code: null, point_status: null, container_name: null, workorder_id: null, full_vehicle_code: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, temperature: null, group_name: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'HotPointIvt',
components: { pagination, crudOperation, rrOperation, udOperation },
dicts: ['sch_point_status', 'product_area', 'is_used', 'point_location'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '烘烤区点位库存',
url: 'api/hotpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
crudMethod: { ...crudHotpointivt },
optShow: {
add: false,
edit: true,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
permission: {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
]
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
}
}
}
</script>
<style scoped>
</style>

421
nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue Normal file
View File

@@ -0,0 +1,421 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="11 0px"
label-suffix=":"
>
<el-form-item label="订单类型">
<el-select
v-model="query.order_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px"
@change="hand"
>
<el-option
v-for="item in dict.order_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px"
@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="状态">
<el-select
v-model="query.status"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px"
@change="hand"
>
<el-option
v-for="item in dict.product_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="机台编码">
<el-input
v-model="query.resource_name"
clearable
size="mini"
placeholder="机台编码"
style="width: 250px"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-input
v-model="query.parent_container_name"
clearable
size="mini"
placeholder="母卷号"
style="width: 250px"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="子卷号">
<el-input
v-model="query.container_name"
clearable
size="mini"
placeholder="母卷号"
style="width: 250px"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length < 1"
@click="upMaterFinish"
>
上料完成
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length < 1"
@click="caseFinish"
>
套管完成
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length < 1"
@click="sendFinish"
>
配送完成
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length < 1"
@click="compelFinish"
>
强制完成
</el-button>
</crudOperation>
<!--表单组件-->
<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="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" style="width: 370px;" />
</el-form-item>
<el-form-item label="分切机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料编码">
<el-input v-model="form.paper_tube_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料描述">
<el-input v-model="form.paper_tube_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料编码">
<el-input v-model="form.FRP_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料描述">
<el-input v-model="form.FRP_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管规格">
<el-input v-model="form.FRP_model" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷幅宽" prop="split_breadth">
<el-input v-model="form.split_breadth" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷理论长度" prop="split_height">
<el-input v-model="form.split_height" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷理论重量" prop="split_weight">
<el-input v-model="form.split_weight" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" 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 v-if="false" prop="workorder_id" label="分切计划标识" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName"/>
<el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName"/>
<el-table-column prop="mfg_order_name" label="订单号" show-overflow-tooltip/>
<el-table-column prop="container_name" label="子卷号" />
<el-table-column prop="parent_container_name" label="母卷号" />
<el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />
<el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px"/>
<el-table-column prop="package_box_sn" label="改制来源子卷木箱号" width="150px" />
<el-table-column prop="resource_name" label="机台编码" />
<el-table-column prop="product_name" label="产品编码" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="split_group" label="分切组" />
<el-table-column prop="manufacture_sort" label="生产顺序" />
<el-table-column prop="manufacture_date" label="生产日期" width="120px" />
<el-table-column prop="split_breadth" label="子卷幅宽" />
<el-table-column prop="split_height" label="子卷理论长度" width="120px" />
<el-table-column prop="split_weight" label="子卷理论重量" width="120px" />
<el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
<el-table-column prop="paper_tube_material" label="纸筒物料编码" width="120px" />
<el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" />
<el-table-column prop="paper_tube_model" label="纸筒规格" />
<el-table-column prop="frp_material" label="FRP管物料编码" width="120px" />
<el-table-column prop="frp_description" label="FRP管物料描述" width="120px" />
<el-table-column prop="frp_model" label="FRP管规格" width="100px" />
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName" />
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />
<el-table-column prop="start_time" label="开始时间" width="150px" />
<el-table-column prop="end_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>
</div>
</template>
<script>
import crudSlittingproductionplan from '@/views/wms/pdm/order/slittingplan/slittingproductionplan'
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 = {
workorder_id: null,
order_type: null,
container_name: null,
product_name: null,
description: null,
parent_container_name: null,
restruct_container_name: null,
package_box_sn: null,
ware_house: null,
resource_name: null,
split_group: null,
manufacture_sort: null,
mfg_order_name: null,
manufacture_date: null,
paper_tube_or_FRP: null,
paper_tube_material: null,
paper_tube_description: null,
paper_tube_model: null,
FRP_material: null,
FRP_description: null,
FRP_model: null,
split_breadth: null,
split_height: null,
split_weight: null,
start_time: null,
end_time: null,
status: null,
remark: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
sysdeptid: null,
syscompanyid: null,
is_delete: null,
is_parent_ok: null,
is_child_tz_ok: null,
is_child_ps_ok: null,
qzzno: null
}
export default {
name: 'Slittingproductionplan',
dicts: ['product_area', 'order_type', 'product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '分切计划',
url: 'api/slittingproductionplan',
idField: 'workorder_id',
sort: 'workorder_id,desc',
crudMethod: { ...crudSlittingproductionplan },
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
permission: {},
rules: {
order_type: [
{ required: true, message: '分切订单类型不能为空', trigger: 'blur' }
],
container_name: [
{ required: true, message: '子卷号不能为空', trigger: 'blur' }
],
product_name: [
{ required: true, message: '产品编码不能为空', trigger: 'blur' }
],
description: [
{ required: true, message: '产品描述不能为空', trigger: 'blur' }
],
ware_house: [
{ required: true, message: '来源卷位置不能为空', trigger: 'blur' }
]
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand() {
this.crud.toQuery()
},
upMaterFinish() {
const _selectData = this.$refs.table.selection
const data = {
'data': _selectData
}
crudSlittingproductionplan.upMaterFinish(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
caseFinish() {
const _selectData = this.$refs.table.selection
const data = {
'data': _selectData
}
crudSlittingproductionplan.caseFinish(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
sendFinish() {
const _selectData = this.$refs.table.selection
const data = {
'data': _selectData
}
crudSlittingproductionplan.sendFinish(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
compelFinish() {
const _selectData = this.$refs.table.selection
const data = {
'data': _selectData
}
crudSlittingproductionplan.compelFinish(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
formatStatusName(row) {
return this.dict.label.product_status[row.status]
},
formatTypeName(row) {
return this.dict.label.order_type[row.order_type]
},
formatHouseName(row) {
return this.dict.label.ware_house[row.ware_house]
},
formatTubeName(row) {
return this.dict.label.paper_tube_or_frp[row.paper_tube_or_frp]
},
formatParentName(row) {
return this.dict.label.IS_OR_NOT[row.is_parent_ok]
},
formatChildName(row) {
return this.dict.label.IS_OR_NOT[row.is_child_tz_ok]
},
formatChildPsName(row) {
return this.dict.label.IS_OR_NOT[row.is_child_ps_ok]
}
}
}
</script>
<style scoped>
</style>

59
nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js Normal file
View File

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

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

@@ -192,7 +192,7 @@
<el-form-item label="是否专机" prop="is_host">
<el-radio-group v-model="form.is_host">
<el-radio
v-for="item in dict.IS_HOST"
v-for="item in dict.IS_OR_NOT"
:label="item.value"
>{{ item.label }}
</el-radio>
@@ -282,7 +282,7 @@
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="vehicle_type" label="是否专机">
<template slot-scope="scope">
{{ dict.label.IS_HOST[scope.row.is_host] }}
{{ dict.label.IS_OR_NOT[scope.row.is_host] }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改者" />
@@ -341,7 +341,7 @@ const defaultForm = {
}
export default {
name: 'Point',
dicts: ['sch_point_type', 'point_location', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_HOST', 'device_point_type'],
dicts: ['sch_point_type', 'point_location', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_OR_NOT', 'device_point_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

2
nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -55,7 +55,7 @@
filterable
size="mini"
class="filter-item"
style="width: 200px;"
style="width: 185px;"
>
<el-option
v-for="item in dict.st_bill_status"

2
nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -55,7 +55,7 @@
filterable
size="mini"
class="filter-item"
style="width: 200px;"
style="width: 185px;"
>
<el-option
v-for="item in dict.st_bill_status"