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

rev:出入库流程兼容

Browse Source
This commit is contained in:
zhangzq
2024-05-29 13:15:50 +08:00
parent 364dc9870c
commit fc521f7580
25 changed files with 184 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
View File

@@ -110,7 +110,7 @@
</el-table-column>
<el-table-column prop="status" label="实例状态">
<template slot-scope="scope">
{{ dict.label.FLOW_STATUS[scope.row.status] }}
{{ statusEnum.label.FLOW_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
@@ -189,7 +189,7 @@ const defaultForm = {
form_data: null
}
export default {
dicts: ["FLOW_STATUS"],
statusEnums: ["FLOW_STATUS"],
name: 'Execution',
components: {pagination, crudOperation, rrOperation, udOperation, ViewCurrentFlowDesigner},
mixins: [presenter(), header(), form(defaultForm), crud()],

8
wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
View File

@@ -86,6 +86,13 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].stor_code" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编号" width="160" align="center">
<template scope="scope">
@@ -291,6 +298,7 @@ export default {
data.material_code = row.material_code
data.material_id = row.material_id
data.material_spec = row.material_spec
data.stor_code = row.stor_code
data.source_form_type = row.form_type
data.source_form_id = row.id
data.unit_id = row.unit_id

2
wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
View File

@@ -65,6 +65,8 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="托盘编号" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="parent_vehicle_code" label="父托盘编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />