huojin
/
Byd_Dg_Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-06-13 14:53:04 +08:00
parent 847b84ae1c
commit ea921a999a
7 changed files with 388 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/packageCheck.js 100644
View File

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

65
src/views/base-data/area/index.vue
View File

@ -5,24 +5,27 @@
<div v-if="crud.props.searchToggle"> <div v-if="crud.props.searchToggle">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label">编号</label> <label class="el-form-item-label">编号</label>
<el-input v-model="query.code" clearable placeholder="编号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" /> <el-input v-model="query.code" clearable placeholder="编号" style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">名称</label> <label class="el-form-item-label">名称</label>
<el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" /> <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
<rrOperation :crud="crud" /> @keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/> <crudOperation :permission="permission" :tableKey="this.$options.name"/>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px"> <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="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="库区编号" prop="code"> <el-form-item label="库区编号" prop="code">
<el-input v-model="form.code" style="width: 370px;" /> <el-input v-model="form.code" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="库区名称" prop="name"> <el-form-item label="库区名称" prop="name">
<el-input v-model="form.name" style="width: 370px;" /> <el-input v-model="form.name" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="agv场景" prop="name" v-if="false"> <el-form-item label="agv场景" prop="name" v-if="false">
<el-select v-model="form.agvScene" placeholder="请选择agv场景" style="width: 370px;" value-key="id"> <el-select v-model="form.agvScene" placeholder="请选择agv场景" style="width: 370px;" value-key="id">
<el-option <el-option
v-for="item in avgSceneOptions" v-for="item in avgSceneOptions"
:key="item.id" :key="item.id"
@ -32,7 +35,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="描述"> <el-form-item label="描述">
<el-input v-model="form.description" style="width: 370px;" /> <el-input v-model="form.description" style="width: 370px;"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -41,11 +44,12 @@
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" height="67vh" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="67vh" size="small" style="width: 100%;"
<el-table-column type="selection" width="55" /> @selection-change="crud.selectionChangeHandler">
<el-table-column prop="code" label="库区编号" /> <el-table-column type="selection" width="55"/>
<el-table-column prop="name" label="库区名称" /> <el-table-column prop="code" label="库区编号"/>
<el-table-column prop="description" label="描述" /> <el-table-column prop="name" label="库区名称"/>
<el-table-column prop="description" label="描述"/>
<el-table-column prop="enabled" label="启用"> <el-table-column prop="enabled" label="启用">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
@ -58,9 +62,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="agvScene.name" label="AGV场景" v-if="false"> <el-table-column prop="agvScene.name" label="AGV场景" v-if="false">
</el-table-column> </el-table-column>
<el-table-column prop="createBy" label="创建人" /> <el-table-column prop="createBy" label="创建人"/>
<el-table-column prop="createTime" label="创建时间" /> <el-table-column prop="createTime" label="创建时间"/>
<el-table-column v-if="checkPer(['admin','area:edit'])" label="操作" align="center"> <el-table-column v-if="checkPer(['admin','area:edit'])" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@ -72,7 +76,7 @@
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<div style="float: right;"> <div style="float: right;">
<pagination /> <pagination/>
</div> </div>
</div> </div>
</div> </div>
@ -81,22 +85,23 @@
<script> <script>
import crudArea from '@/api/area' import crudArea from '@/api/area'
import {selectEgvSceneAll} from '@/api/agvScene' import {selectEgvSceneAll} from '@/api/agvScene'
import CRUD, { presenter, header, form, crud } from '@crud/crud' import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import { inject } from "vue"; import {inject} from "vue";
const defaultForm = { id: null,enabled: 1,code: null,name: null,description: null,agvScene:null} const defaultForm = {id: null, enabled: 1, code: null, name: null, description: null, agvScene: null}
export default { export default {
name: 'Area', name: 'Area',
// eslint-disable-next-line vue/no-unused-components // eslint-disable-next-line vue/no-unused-components
components: { pagination, crudOperation, rrOperation, udOperation }, components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['base_staus'], dicts: ['base_staus'],
cruds() { cruds() {
return CRUD({ title: '库区', url: 'api/area', idField: 'id', sort: 'id,desc', crudMethod: { ...crudArea }, return CRUD({
title: '库区', url: 'api/area', idField: 'id', sort: 'id,desc', crudMethod: {...crudArea},
optShow: { optShow: {
add: true, add: true,
edit: false, edit: false,
@ -112,10 +117,10 @@ export default {
return { return {
show_update: true, show_update: true,
queryTypeOptions: [ queryTypeOptions: [
{ key: 'code', display_name: '代码' }, {key: 'code', display_name: '代码'},
{ key: 'name', display_name: '名称' }, {key: 'name', display_name: '名称'},
{ key: 'enabled', display_name: '状态' }, {key: 'enabled', display_name: '状态'},
{ key: 'heat', display_name: '热度' } {key: 'heat', display_name: '热度'}
], ],
permission: { permission: {
add: ['admin', 'area:add'], add: ['admin', 'area:add'],
@ -124,10 +129,10 @@ export default {
}, },
rules: { rules: {
code: [ code: [
{ required: true, message: '库区编号不能为空', trigger: 'blur' } {required: true, message: '库区编号不能为空', trigger: 'blur'}
] ]
}, },
avgSceneOptions:[] avgSceneOptions: []
} }
}, },
mounted() { mounted() {
@ -156,9 +161,9 @@ export default {
data.enabled = !data.enabled data.enabled = !data.enabled
}) })
}, },
getAgvSceneAllDate(){ getAgvSceneAllDate() {
selectEgvSceneAll().then(res => { selectEgvSceneAll().then(res => {
this.avgSceneOptions=res; this.avgSceneOptions = res;
}) })
} }
} }

94
src/views/base-data/bigBom/index.vue
View File

@ -2,37 +2,50 @@
<div class="app-container"> <div class="app-container">
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">bigitem</label>
<el-input v-model="query.bigItemCode" clearable style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">item</label>
<el-input v-model="query.itemCode" clearable style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/> <crudOperation :permission="permission" :tableKey="this.$options.name"/>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px"> <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="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="bigItem" prop="bigItem"> <el-form-item label="bigItem" prop="bigItem">
<el-select v-model="form.bigItem" value-key="id" filterable placeholder="请选择" style="width: 370px;"> <el-select v-model="form.bigItem" value-key="id" filterable placeholder="请选择" style="width: 370px;">
<el-option <el-option
v-for="item in bigItemList" v-for="item in bigItemList"
:key="item.id" :key="item.id"
:label="item.code" :label="item.code"
:value="item" > :value="item">
<span style="float: left">{{ item.code }}</span> <span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="item" prop="item"> <el-form-item label="item" prop="item">
<el-select v-model="form.item" value-key="id" filterable placeholder="请选择" style="width: 370px;"> <el-select v-model="form.item" value-key="id" filterable placeholder="请选择" style="width: 370px;">
<el-option <el-option
v-for="item in itemList" v-for="item in itemList"
:key="item.id" :key="item.id"
:label="item.code" :label="item.code"
:value="item" > :value="item">
<span style="float: left">{{ item.code }}</span> <span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="quantity"> <el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" style="width: 370px;" /> <el-input v-model="form.quantity" style="width: 370px;"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -41,16 +54,14 @@
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
<el-table-column type="selection" width="55" /> @selection-change="crud.selectionChangeHandler">
<el-table-column prop="id" label="id" /> <el-table-column type="selection" width="55"/>
<el-table-column prop="bigItem.code" label="bigitem" /> <el-table-column prop="bigItem.code" label="bigitem"/>
<el-table-column prop="item.code" label="item" /> <el-table-column prop="item.code" label="item"/>
<el-table-column prop="quantity" label="数量" /> <el-table-column prop="quantity" label="数量"/>
<el-table-column prop="createBy" label="创建人" /> <el-table-column prop="createTime" label="创建时间"/>
<el-table-column prop="updateBy" label="修改人" /> <el-table-column prop="updateTime" label="修改时间"/>
<el-table-column prop="createTime" label="创建时间" />
<el-table-column prop="updateTime" label="修改时间" />
<el-table-column v-if="checkPer(['admin','bigBom:edit','bigBom:del'])" label="操作" align="center"> <el-table-column v-if="checkPer(['admin','bigBom:edit','bigBom:del'])" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
@ -62,27 +73,51 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import crudBigBom from '@/api/bigBom' import crudBigBom from '@/api/bigBom'
import CRUD, { presenter, header, form, crud } from '@crud/crud' import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import {getAllBigItem} from '@/api/bigItem' import {getAllBigItem} from '@/api/bigItem'
import {getItemsList} from '@/api/item' import {getItemsList} from '@/api/item'
const defaultForm = { id: null, bigItem: null, item: null, quantity: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
const defaultForm = {
id: null,
bigItem: null,
item: null,
quantity: null,
deptId: null,
createBy: null,
updateBy: null,
createTime: null,
updateTime: null
}
export default { export default {
name: 'BigBom', name: 'BigBom',
components: { pagination, crudOperation, rrOperation, udOperation }, components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ title: 'Bom管理', url: 'api/bigBom', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBigBom }}) return CRUD({
title: 'Bom管理',
url: 'api/bigBom',
idField: 'id',
sort: 'id,desc',
crudMethod: {...crudBigBom},
optShow: {
add: true,
edit: false,
del: false,
reset: true,
download: true
}
})
}, },
data() { data() {
return { return {
@ -95,15 +130,16 @@ export default {
}, },
rules: { rules: {
bigItem: [ bigItem: [
{ required: true, message: '请选择bigItem', trigger: 'blur'} {required: true, message: '请选择bigItem', trigger: 'blur'}
], ],
item: [ item: [
{ required: true, message: '请选择item', trigger: 'blur'} {required: true, message: '请选择item', trigger: 'blur'}
], ],
quantity: [ quantity: [
{required: true, message: '数量不能为空', trigger: 'blur'} {required: true, message: '数量不能为空', trigger: 'blur'}
] ]
} } }
}
}, },
mounted() { mounted() {
this.getBigItem(); this.getBigItem();
@ -114,13 +150,13 @@ export default {
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
return true return true
}, },
getBigItem(){ getBigItem() {
getAllBigItem({}).then(res=>{ getAllBigItem({}).then(res => {
this.bigItemList = res this.bigItemList = res
}) })
}, },
getItem(){ getItem() {
getItemsList({}).then(res=>{ getItemsList({}).then(res => {
this.itemList = res this.itemList = res
}) })
}, },

83
src/views/base-data/bigItem/index.vue
View File

@ -2,22 +2,36 @@
<div class="app-container"> <div class="app-container">
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">代码</label>
<el-input v-model="query.code" clearable placeholder="代码" style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">名称</label>
<el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/>
<rrOperation :crud="crud"/>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/> <crudOperation :permission="permission" :tableKey="this.$options.name"/>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px"> <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="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="代码"> <el-form-item label="代码">
<el-input v-model="form.code" style="width: 370px;" /> <el-input v-model="form.code" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="form.name" style="width: 370px;" /> <el-input v-model="form.name" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="类型"> <el-form-item label="类型">
<el-input v-model="form.type" style="width: 370px;" /> <el-input v-model="form.type" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" /> <el-input v-model="form.remark" style="width: 370px;"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -26,18 +40,15 @@
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
<el-table-column type="selection" width="55" /> @selection-change="crud.selectionChangeHandler">
<el-table-column prop="id" label="id" /> <el-table-column type="selection" width="55"/>
<el-table-column prop="code" label="代码" /> <el-table-column prop="code" label="代码"/>
<el-table-column prop="name" label="名称" /> <el-table-column prop="name" label="名称"/>
<el-table-column prop="type" label="类型" /> <el-table-column prop="remark" label="备注"/>
<el-table-column prop="remark" label="备注" /> <el-table-column prop="createTime" label="创建时间"/>
<el-table-column prop="createBy" label="创建人" /> <el-table-column prop="updateTime" label="修改时间"/>
<el-table-column prop="updateBy" label="修改人" /> <el-table-column v-if="checkPer(['admin','bigItem:edit','bigItem:del'])" label="操作" align="center">
<el-table-column prop="createTime" label="创建时间" />
<el-table-column prop="updateTime" label="修改时间" />
<el-table-column v-if="checkPer(['admin','bigItem:edit','bigItem:del'])" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@ -48,26 +59,50 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import crudBigItem from '@/api/bigItem' import crudBigItem from '@/api/bigItem'
import CRUD, { presenter, header, form, crud } from '@crud/crud' import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
const defaultForm = { id: null, code: null, name: null, type: null, remark: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null } const defaultForm = {
id: null,
code: null,
name: null,
type: null,
remark: null,
deptId: null,
createBy: null,
updateBy: null,
createTime: null,
updateTime: null
}
export default { export default {
name: 'BigItem', name: 'BigItem',
components: { pagination, crudOperation, rrOperation, udOperation }, components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ title: 'bigitem', url: 'api/bigItem', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBigItem }}) return CRUD({
title: 'bigitem',
url: 'api/bigItem',
idField: 'id',
sort: 'id,desc',
crudMethod: {...crudBigItem},
optShow: {
add: true,
edit: false,
del: false,
reset: true,
download: true
},
})
}, },
data() { data() {
return { return {
@ -76,8 +111,8 @@ export default {
edit: ['admin', 'bigItem:edit'], edit: ['admin', 'bigItem:edit'],
del: ['admin', 'bigItem:del'] del: ['admin', 'bigItem:del']
}, },
rules: { rules: {}
} } }
}, },
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据

95
src/views/base-data/box/index.vue
View File

@ -36,7 +36,8 @@
<label class="el-form-item-label">库区</label> <label class="el-form-item-label">库区</label>
<el-select v-model="query.areaName" @focus="getArea" style="width: 120px;" filterable clearable placeholder="请选择" @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery"> <el-select v-model="query.areaName" @focus="getArea" style="width: 120px;" filterable clearable
placeholder="请选择" @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
<el-option <el-option
v-for="area in areas" v-for="area in areas"
:key="area.id" :key="area.id"
@ -108,7 +109,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料" > <el-form-item label="物料">
<el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id" <el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id"
style="width: 370px;"> style="width: 370px;">
<el-option <el-option
@ -118,8 +119,8 @@
:value="item" :value="item"
:disabled="!item.enabled" :disabled="!item.enabled"
> >
<span style="float: left">{{ item.code}}</span> <span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -131,17 +132,17 @@
<el-input v-model="form.iP" style="width: 370px;"/> <el-input v-model="form.iP" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="指示灯状态"> <el-form-item label="指示灯状态">
<el-select v-model="form.lampStatus" filterable placeholder="请选择物料" style="width: 370px;"> <el-select v-model="form.lampStatus" filterable placeholder="请选择物料" style="width: 370px;">
<el-option <el-option
v-for="item in this.dict.lamp_status" v-for="item in this.dict.lamp_status"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="按钮盒编号"> <el-form-item label="按钮盒编号">
<!-- <el-input v-model="form.lampCode" style="width: 370px;"/>--> <!-- <el-input v-model="form.lampCode" style="width: 370px;"/>-->
<el-select v-model="form.lampCode" clearable filterable placeholder="请选择编号" style="width: 370px;"> <el-select v-model="form.lampCode" clearable filterable placeholder="请选择编号" style="width: 370px;">
<el-option <el-option
v-for="item in this.dict.lamp_code" v-for="item in this.dict.lamp_code"
@ -173,9 +174,9 @@
<el-table-column prop="xh" label="序号" type="index" width="50"/> <el-table-column prop="xh" label="序号" type="index" width="50"/>
<el-table-column prop="code" label="编号"/> <el-table-column prop="code" label="编号"/>
<el-table-column prop="name" label="名称"/> <el-table-column prop="name" label="名称"/>
<el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码"> <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.item==null?"":scope.row.item.code }}</div> <div>{{ scope.row.item == null ? "" : scope.row.item.code }}</div>
</template> </template>
</el-table-column> </el-table-column>
@ -185,14 +186,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="点位库区" prop="areaName"> <el-table-column label="点位库区" prop="areaName">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.point.area.name }}</div> <div>{{ scope.row.point.area.name }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNumber" label="工单号"/> <el-table-column prop="orderNumber" label="工单号"/>
<el-table-column prop="iP" label="IP"/> <el-table-column prop="iP" label="IP"/>
<el-table-column prop="lampStatus" label="指示灯状态"/> <el-table-column prop="lampStatus" label="指示灯状态"/>
@ -242,31 +242,30 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import {getItemsList} from "@/api/item" import {getItemsList} from "@/api/item"
import pointUrl, {queryPointList} from "@/api/point" import {queryPointList} from "@/api/point"
import {getAres, queryAreaList} from "@/api/area" import {queryAreaList} from "@/api/area"
import BindOrderNumber from "@/views/base-data/box/bindOrderNumber.vue" import BindOrderNumber from "@/views/base-data/box/bindOrderNumber.vue"
import DonMessage from '@/utils/message'
const defaultForm = { const defaultForm = {
name:null, name: null,
code:null, code: null,
id: null, id: null,
item: null, item: null,
point: null, point: null,
orderNumber:null, orderNumber: null,
createBy: null, createBy: null,
updateBy: null, updateBy: null,
createTime: null, createTime: null,
updateTime: null, updateTime: null,
iP:null, iP: null,
lampStatus:null, lampStatus: null,
lampCode:null lampCode: null
} }
export default { export default {
name: 'Box', name: 'Box',
components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber}, components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber},
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['base_staus','lamp_status','lamp_code'], dicts: ['base_staus', 'lamp_status', 'lamp_code'],
cruds() { cruds() {
return CRUD({ return CRUD({
title: '按钮盒', title: '按钮盒',
@ -288,13 +287,13 @@ export default {
return { return {
items: [], items: [],
points: [], points: [],
pointsUpdate:[], pointsUpdate: [],
pointsInsert:[], pointsInsert: [],
areas: [], areas: [],
params: { params: {
type: 'BOX', type: 'BOX',
status:'FREE', status: 'FREE',
enabled:1 enabled: 1
}, },
permission: { permission: {
add: ['admin', 'box:add'], add: ['admin', 'box:add'],
@ -334,19 +333,19 @@ export default {
}, },
getPoint() { getPoint() {
queryPointList(this.params).then(res => { queryPointList(this.params).then(res => {
this.points =res; this.points = res;
this.pointsInsert=res; this.pointsInsert = res;
}) })
queryPointList({ queryPointList({
type: 'BOX', type: 'BOX',
enabled:1 enabled: 1
}).then(res => { }).then(res => {
this.pointsUpdate=res; this.pointsUpdate = res;
}) })
}, },
getArea() { getArea() {
queryAreaList({ }).then(res => { queryAreaList({}).then(res => {
this.areas= res; this.areas = res;
}) })
}, },
changeEnabled(data, val) { changeEnabled(data, val) {
@ -369,13 +368,13 @@ export default {
}, },
//呼叫按钮 //呼叫按钮
callBox(data) { callBox(data) {
this.CallBox.id=data.id this.CallBox.id = data.id
crudBox.callBox(this.CallBox).then(res => { crudBox.callBox(this.CallBox).then(res => {
if(res.status==200){ if (res.status == 200) {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS); this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
this.$parent.shuaxinContainerList() this.$parent.shuaxinContainerList()
this.$refs['form'].resetFields(); this.$refs['form'].resetFields();
}else{ } else {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR); this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
} }
}).catch(() => { }).catch(() => {
@ -383,16 +382,16 @@ export default {
}) })
}, },
//单选时触发 //单选时触发
selectOneMethod(selection, row){ selectOneMethod(selection, row) {
if (selection.length===1){ if (selection.length === 1) {
this.points=this.pointsUpdate; this.points = this.pointsUpdate;
}else { } else {
this.points=this.pointsInsert; this.points = this.pointsInsert;
} }
}, },
//全选时触发 //全选时触发
selectAllMethod(selection){ selectAllMethod(selection) {
this.points=this.pointsInsert; this.points = this.pointsInsert;
} }
} }
} }

147
src/views/base-data/packageCheck/index.vue 100644
View File

@ -0,0 +1,147 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/>
<!--表单组件-->
<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="small" label-width="80px">
<el-form-item label="成套代码" prop="code">
<el-input v-model="form.code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="物料" prop="item">
<el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id"
style="width: 370px;">
<el-option
v-for="item in items"
:key="item.id"
:label="item.code"
:value="item"
:disabled="!item.enabled"
>
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="套数">
<el-input v-model="form.quantity" style="width: 370px;" :min="0" type="number"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column prop="xh" label="序号" type="index" width="50"/>
<el-table-column prop="code" label="成套代码"/>
<el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
<template slot-scope="scope">
<div>{{ scope.row.item == null ? "" : scope.row.item.code }}</div>
</template>
</el-table-column>
<el-table-column prop="quantity" label="套数"/>
<el-table-column prop="createTime" label="创建时间"/>
<el-table-column prop="updateTime" label="修改时间"/>
<el-table-column v-if="checkPer(['admin','packageCheck:edit','packageCheck:del'])" label="操作"
align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:show-dle="false"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
</div>
</div>
</template>
<script>
import crudPackageCheck from '@/api/packageCheck'
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 {getItemsList} from "@/api/item";
const defaultForm = {
id: null,
code: null,
itemId: null,
quantity: null,
createBy: null,
updateBy: null,
createTime: null,
updateTime: null
}
export default {
name: 'PackageCheck',
components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '翻包标准套数',
url: 'api/packageCheck',
idField: 'id',
sort: 'id,desc',
crudMethod: {...crudPackageCheck},
optShow: {
add: true,
edit: false,
del: false,
reset: true,
download: true
}
})
},
data() {
return {
permission: {
add: ['admin', 'packageCheck:add'],
edit: ['admin', 'packageCheck:edit'],
del: ['admin', 'packageCheck:del']
},
rules: {
code: [
{required: true, message: '成套代码不能为空', trigger: 'blur'}
],
item: [
{required: true, message: '物料不能为空', trigger: 'blur'}
]
}
}
},
mounted() {
//编辑下拉出现内容
this.getItem();
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
getItem() {
getItemsList({}).then(res => {
this.items = res;
})
},
}
}
</script>
<style scoped>
</style>

8
src/views/base-data/stock/index.vue
View File

@ -4,8 +4,11 @@
<div class="head-container"> <div class="head-container">
<div v-if="crud.props.searchToggle"> <div v-if="crud.props.searchToggle">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label">代码</label>
<el-input v-model="query.code" clearable placeholder="代码" style="width: 150px;" class="filter-item" <el-input v-model="query.code" clearable placeholder="代码" style="width: 150px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/> @keyup.enter.native="crud.toQuery"/>
<label class="el-form-item-label">状态</label>
<el-select <el-select
v-model="query.status" v-model="query.status"
clearable clearable
@ -22,6 +25,8 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<label class="el-form-item-label">容器类型</label>
<el-select <el-select
v-model="query.stockType" v-model="query.stockType"
clearable clearable
@ -39,6 +44,7 @@
/> />
</el-select> </el-select>
<label class="el-form-item-label">库区</label>
<el-select v-model="query.areaName" style="width: 120px;" clearable placeholder="库区" <el-select v-model="query.areaName" style="width: 120px;" clearable placeholder="库区"
@keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery"> @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
<el-option <el-option
@ -48,6 +54,8 @@
:value="area.name" :value="area.name"
/> />
</el-select> </el-select>
<label class="el-form-item-label">点位</label>
<el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 150px;" class="filter-item" <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 150px;" class="filter-item"
@keyup.enter.native="crud.toQuery"/> @keyup.enter.native="crud.toQuery"/>