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

rev:分配逻辑；todo:分配完更新单据还是载具？

Browse Source
This commit is contained in:
zhangzq
2024-05-10 20:23:28 +08:00
parent c4b129e2f2
commit 0da5aed56b
21 changed files with 472 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue
View File

@@ -13,7 +13,7 @@
>
<el-form-item label="载具类型">
<el-select
v-model="query.storagevehicle_type"
v-model="query.vehicle_type"
clearable
size="mini"
placeholder="请选择"
@@ -31,7 +31,7 @@
<el-form-item label="载具号">
<el-input
v-model="query.storagevehicle_code_begin"
v-model="query.vehicle_code_begin"
clearable
size="mini"
placeholder="起始载具号"
@@ -41,7 +41,7 @@
/>
-
<el-input
v-model="query.storagevehicle_code_end"
v-model="query.vehicle_code_end"
clearable
size="mini"
placeholder="结束载具号"
@@ -77,7 +77,7 @@
>
<el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="materialForm.storagevehicle_code" disabled style="width: 370px;" />
<el-input v-model="materialForm.vehicle_code" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<template slot-scope="scope">
@@ -109,9 +109,9 @@
@close="materiValueCancel()"
>
<el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
<el-form-item label="载具编号" prop="storagevehicle_code">
<el-form-item label="载具编号" prop="vehicle_code">
<template slot-scope="scope">
<el-input v-model="updateForm.storagevehicle_code" clearable />
<el-input v-model="updateForm.vehicle_code" clearable />
</template>
</el-form-item>
<el-form-item label="载具重量(g)" prop="vehicle_weight">
@@ -164,9 +164,9 @@
width="450px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="载具类型" prop="storagevehicle_type">
<el-form-item label="载具类型" prop="vehicle_type">
<el-select
v-model="form.storagevehicle_type"
v-model="form.vehicle_type"
clearable
size="mini"
placeholder="请选择"
@@ -182,8 +182,8 @@
</el-select>
</el-form-item>
<br>
<el-form-item label="起始载具号" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
<el-form-item label="起始载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" :disabled="true" style="width: 250px;" />
</el-form-item>
<el-form-item label="载具数量" prop="num">
<el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
@@ -209,18 +209,17 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type" label="载具类型">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
{{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="storagevehicle_code" label="载具编码">
<el-table-column prop="vehicle_code" label="载具编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.storagevehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
<el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.vehicle_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column prop="vehicle_name" label="载具名称" />
<el-table-column prop="vehicle_weight" label="载具单重(g)" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
@@ -232,8 +231,8 @@
/>
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_name" label="创建人" />
<el-table-column prop="update_time" label="创建时间" />
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
label="操作"
@@ -276,27 +275,23 @@ import { getLodop } from '@/assets/js/lodop/LodopFuncs'
// import MaterDtl from '@/views/wms/pub/MaterDialog'
const defaultForm = {
storagevehicle_id: null,
storagevehicle_code: null,
storagevehicle_name: null,
vehicle_code: null,
vehicle_name: null,
one_code: null,
two_code: null,
rfid_code: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_name: null,
update_time: null,
is_delete: null,
is_used: '1',
storagevehicle_type: null,
vehicle_width: null,
vehicle_long: null,
vehicle_height: null,
w: null,
l: null,
h: null,
weight: null,
overstruct_type: null,
occupystruct_qty: null,
ext_id: null,
ext_json: null,
num: '1'
}
export default {
@@ -308,8 +303,8 @@ export default {
return CRUD({
title: '载具',
url: 'api/bmVehicleInfo',
idField: 'storagevehicle_id',
sort: 'storagevehicle_id,desc',
idField: 'vehicle_code',
sort: 'vehicle_code,desc',
crudMethod: { ...crudStoragevehicleinfo },
optShow: {
add: true,
@@ -349,16 +344,7 @@ export default {
resultCodeArr: [],
permission: {},
rules: {
storagevehicle_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_name: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_time: [
vehicle_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
is_delete: [
@@ -367,7 +353,7 @@ export default {
is_used: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
storagevehicle_type: [
vehicle_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
overstruct_type: [
@@ -462,7 +448,7 @@ export default {
console.log(_selectData.length)
console.log(this.printForm)
for (let i = 0; i < _selectData.length; i++) {
const code = _selectData[i].storagevehicle_code
const code = _selectData[i].vehicle_code
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
@@ -523,11 +509,11 @@ export default {
getVehicle(code) {
if (!code) {
this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
this.form.storagevehicle_code = ''
this.form.vehicle_code = ''
return false
}
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.storagevehicle_code = res.value
this.form.vehicle_code = res.value
})
}
}

4
wms_pro/qd/src/views/wms/config_manage/formStruc/index.vue
View File

@@ -130,8 +130,8 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="自定义映射" prop="class_desc">
<el-input type="textarea" v-model="form.form_param" style="width: 370px;" />
<el-form-item label="自定义字段2" prop="class_desc">
<el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

246
wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue Normal file
View File

@@ -0,0 +1,246 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="600px"
>
<el-form ref="form" :model="form" size="mini" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="表单类型" prop="class_code">
<el-input v-model="form.form_type" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="表单名称" prop="class_name">
<el-input v-model="form.form_name" style="width: 120px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col >
<el-form-item label="表单描述" prop="class_name">
<el-input v-model="form.form_desc" style="width: 370px;" />
</el-form-item>
</el-col>
<el-col >
<el-form-item label="表单对应json" prop="class_name">
<el-input v-model="form.convert_json" style="width: 370px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col >
<el-form-item label="是否含有子表" prop="class_name">
<el-radio-group v-model="form.has_child" style="width: 140px">
<el-radio label=true>是</el-radio>
<el-radio label=false>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col>
<el-select
v-model="form.parent_id"
placeholder="父表类型"
clearable
>
<el-option
v-for="item in form_types"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务表id映射" prop="class_desc">
<el-input v-model="form.bus_id" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务表编码映射" prop="class_desc">
<el-input v-model="form.bus_code" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务表时间映射" prop="class_desc">
<el-input v-model="form.bus_data" style="width: 120px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="业务表状态映射" prop="class_desc">
<el-input v-model="form.bus_status" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料id映射" prop="class_desc">
<el-input v-model="form.material_id" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料数量映射" prop="class_desc">
<el-input v-model="form.qty" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料批次映射" prop="class_desc">
<el-input v-model="form.pcsn" style="width: 120px;" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="自定义字段2" prop="class_desc">
<el-input type="textarea" v-model="form.form_param" :formatter="jsonFormat" 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"
lazy
:load="getClassDatas"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:data="crud.data"
row-key="id"
@select="crud.selectChange"
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="form_type" label="表单类型" />
<el-table-column prop="form_name" label="表单名称" />
<el-table-column prop="form_desc" label="描述" />
<el-table-column prop="convert_json" label="表单对应json" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
<el-table-column prop="parent_id" label="父表id" />
<el-table-column prop="bus_id" label="业务单据id映射" />
<el-table-column prop="bus_code" label="业务单据code映射" />
<el-table-column prop="bus_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" />
<el-table-column prop="qty" label="物料数量映射" />
<el-table-column prop="pcsn" label="物料批次映射" />
<el-table-column prop="form_param" :show-overflow-tooltip="true" :formatter="jsonFormat" label="自定义字段映射" />
<el-table-column
label="操作"
width="250px"
align="center"
>
<template slot-scope="scope">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
:disabled-edit="scope.row.is_modify === '0'"
:disabled-dle="scope.row.is_modify === '0'"
msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
/>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
<el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
form_type: null,
form_name: null,
form_desc: null,
create_time: null,
create_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
bus_status: null,
material_id: null,
qty: null,
pcsn: null,
form_param: null,
has_child: false,
parent_id: null
}
export default {
name: 'FormStruc',
dicts: ['base_data'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '基础类别',
url: 'api/bmFormStruc',
idField: 'id',
sort: 'id,desc',
query: {'search':'组盘'},
crudMethod: { ...formstruc },
optShow: {
add: true,
reset: true
}
})
},
data() {
return {
classes: [],
uploadShow: false,
form_types: [],
permission: {}
}
},
created() {
this.getFormSelect() // 获取分类
},
methods: {
getFormSelect() {
formstruc.getTypes().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
this.form_types = res
})
},
booleanFormat(row, index) {
if (row.has_child) {
return '是'
} else {
return '否'
}
},
jsonFormat(row, index) {
if (row.form_param != null) {
return JSON.stringify(row.form_param)
}
return ''
}
}
}
</script>
<style scoped>
</style>