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

rev:出入库流程兼容

Browse Source
This commit is contained in:
zhangzq
2024-06-03 10:09:04 +08:00
parent e446f8b743
commit a243c910ce
85 changed files with 741 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wms_pro/qd/src/views/wms/base_manage/sect/index.vue
View File

@@ -19,10 +19,10 @@
@change="crud.toQuery"
>
<el-option
v-for="item in stors"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@@ -71,17 +71,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属仓库" prop="stor_id">
<el-form-item label="归属仓库" prop="id">
<el-select
v-model="form.stor_id"
v-model="form.id"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in stors"
:key="item.stor_id"
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.id"
:label="item.stor_name"
:value="item.stor_id"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -201,7 +201,7 @@ const defaultForm = {
sect_name: null,
simple_name: null,
sect_type_attr: null,
stor_id: null,
id: null,
stor_type: null,
capacity: null,
width: null,
@@ -231,6 +231,7 @@ const defaultForm = {
export default {
name: 'Sectattr',
dicts: ['st_sect_type', 'is_used'],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#id' ],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -265,7 +266,6 @@ export default {
}
}
return {
stors: [],
permission: {
add: ['admin', 'user:add'],
edit: ['admin', 'user:edit'],
@@ -281,7 +281,7 @@ export default {
sect_type_attr: [
{ required: true, message: '库区类型不能为空', trigger: 'blur' }
],
stor_id: [
id: [
{ required: true, message: '仓库标识不能为空', trigger: 'blur' }
],
capacity: [
@@ -294,11 +294,6 @@ export default {
}
}
},
created() {
crudStorattr.getStor({}).then(res => {
this.stors = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {

6
wms_pro/qd/src/views/wms/base_manage/stor/index.vue
View File

@@ -186,7 +186,7 @@ import { getDepts, getDeptSuperior } from '@/views/system/dept/dept'
import { isvalidPhone } from '@/utils/validate'
const defaultForm = {
stor_id: null,
id: null,
stor_code: null,
stor_name: null,
simple_name: null,
@@ -231,8 +231,8 @@ export default {
title: '仓库',
optShow: { add: true, reset: true },
url: 'api/stIvtBsrealstorattr',
idField: 'stor_id',
sort: 'stor_id,desc',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...crudStorattr }
})
},

34
wms_pro/qd/src/views/wms/base_manage/struct/index.vue
View File

@@ -9,15 +9,21 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="所属库区">
<el-cascader
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
<el-form-item label="所属仓库">
<el-select
v-model="query.stor_id"
clearable
class="filter-item"
@change="sectQueryChange"
/>
placeholder="所属仓库"
@change="crud.toQuery"
>
<el-option
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
@@ -106,7 +112,7 @@
<el-col :span="12">
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-input v-model="form.storagevehicle_code" style="width: 200px;" />
<el-input v-model="form.vehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -201,7 +207,7 @@
<el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
<el-table-column prop="sect_name" label="所属库区" width="150" />
<el-table-column prop="stor_name" label="所属仓库" width="150" />
<el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
<el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
<el-table-column prop="is_temp" label="是否临时" width="150" >
<template slot-scope="scope">
{{ scope.row.is_temp ? '是' : '否' }}
@@ -272,7 +278,7 @@ const defaultForm = {
sect_id: null,
sect_code: null,
sect_name: null,
stor_id: null,
id: null,
stor_code: null,
stor_name: null,
stor_type: null,
@@ -311,6 +317,7 @@ const defaultForm = {
export default {
name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type'],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#id' ],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -363,7 +370,7 @@ export default {
sect_id: [
{ required: true, message: '库区标识不能为空', trigger: 'blur' }
],
stor_id: [
id: [
{ required: true, message: '仓库标识不能为空', trigger: 'blur' }
],
capacity: [
@@ -392,11 +399,6 @@ export default {
}
}
},
created() {
crudSectattr.getSect().then(res => {
this.sects = res.content
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {