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-05-21 13:54:55 +08:00
parent c0abb88e80
commit b3fee56bb9
23 changed files with 267 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="父表类型" prop="class_name">
<el-form-item label="父表类型" prop="parent_id">
<el-select
v-model="form.parent_id"
placeholder="父表类型"
@@ -81,7 +81,7 @@
<el-option
v-for="item in form_types"
:key="item.id"
:label="item.label"
:label="item.lable"
:value="item.id"
/>
</el-select>
@@ -98,13 +98,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务表id映射" prop="bus_id">
<el-input v-model="form.bus_id" style="width: 150px;"/>
<el-form-item label="业务表id映射" prop="biz_id">
<el-input v-model="form.biz_id" style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务表编码映射" prop="bus_code">
<el-input v-model="form.bus_code" style="width: 150px;"/>
<el-form-item label="业务表编码映射" prop="biz_code">
<el-input v-model="form.biz_code" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
@@ -115,8 +115,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务表状态映射" prop="bus_status">
<el-input v-model="form.bus_status" style="width: 150px;"/>
<el-form-item label="业务表状态映射" prop="biz_status">
<el-input v-model="form.biz_status" style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
@@ -171,10 +171,10 @@
<el-table-column prop="convert_json" show-overflow-tooltip width="120" label="数据映射字段"/>
<el-table-column prop="has_child" show-overflow-tooltip width="120" :formatter="booleanFormat" label="是否关联子表"/>
<!-- <el-table-column prop="parent_id" show-overflow-tooltip width="120" label="父表id"/>-->
<el-table-column prop="bus_id" show-overflow-tooltip width="120" label="业务单据id映射"/>
<el-table-column prop="bus_code" show-overflow-tooltip width="130" label="业务单据code映射"/>
<el-table-column prop="bus_date" show-overflow-tooltip width="130" label="业务单据时间映射"/>
<el-table-column prop="status" show-overflow-tooltip width="130" label="业务单据状态映射"/>
<el-table-column prop="biz_id" show-overflow-tooltip width="120" label="业务单据id映射"/>
<el-table-column prop="biz_code" show-overflow-tooltip width="130" label="业务单据code映射"/>
<el-table-column prop="biz_date" show-overflow-tooltip width="130" label="业务单据时间映射"/>
<el-table-column prop="biz_status" show-overflow-tooltip width="130" label="业务单据状态映射"/>
<el-table-column prop="material_id" show-overflow-tooltip width="120" label="物料id映射"/>
<el-table-column prop="qty" show-overflow-tooltip width="120" label="物料数量映射"/>
<el-table-column prop="pcsn" show-overflow-tooltip width="120" label="物料批次映射"/>
@@ -223,10 +223,10 @@ const defaultForm = {
form_desc: null,
create_time: null,
create_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
bus_status: null,
biz_id: null,
biz_code: null,
biz_date: null,
biz_status: null,
material_id: null,
qty: null,
pcsn: null,

20
wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue
View File

@@ -89,12 +89,12 @@
<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-input v-model="form.biz_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-input v-model="form.biz_code" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -106,7 +106,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="业务表状态映射" prop="class_desc">
<el-input v-model="form.bus_status" style="width: 120px;" />
<el-input v-model="form.biz_status" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -153,9 +153,9 @@
<el-table-column prop="create_time" label="创建时间" min-width="150"/>
<el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
<el-table-column prop="parent_id" label="父表id" min-width="150"/>
<el-table-column prop="bus_id" label="业务单据id映射" min-width="150"/>
<el-table-column prop="bus_code" label="业务单据code映射" min-width="150"/>
<el-table-column prop="bus_date" label="业务单据时间映射" min-width="150"/>
<el-table-column prop="biz_id" label="业务单据id映射" min-width="150"/>
<el-table-column prop="biz_code" label="业务单据code映射" min-width="150"/>
<el-table-column prop="biz_date" label="业务单据时间映射" min-width="150"/>
<el-table-column prop="status" label="业务单据状态映射" min-width="150"/>
<el-table-column prop="material_id" label="物料id映射" min-width="150"/>
<el-table-column prop="qty" label="物料数量映射" min-width="150"/>
@@ -204,10 +204,10 @@ const defaultForm = {
form_desc: null,
create_time: null,
create_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
bus_status: null,
biz_id: null,
biz_code: null,
biz_date: null,
biz_status: null,
material_id: null,
qty: null,
pcsn: null,

20
wms_pro/qd/src/views/wms/early_manage/early_data/index.vue
View File

@@ -94,12 +94,12 @@
<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-input v-model="form.biz_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-input v-model="form.biz_code" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -111,7 +111,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="业务表状态映射" prop="class_desc">
<el-input v-model="form.bus_status" style="width: 120px;" />
<el-input v-model="form.biz_status" style="width: 120px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -158,9 +158,9 @@
<el-table-column prop="create_time" label="创建时间" min-width="150"/>
<el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
<el-table-column prop="parent_id" label="父表id" min-width="150"/>
<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="biz_id" label="业务单据id映射" />
<el-table-column prop="biz_code" label="业务单据code映射" />
<el-table-column prop="biz_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" min-width="120"/>
<el-table-column prop="qty" label="物料数量映射" min-width="120"/>
@@ -209,10 +209,10 @@ const defaultForm = {
form_desc: null,
create_time: null,
create_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
bus_status: null,
biz_id: null,
biz_code: null,
biz_date: null,
biz_status: null,
material_id: null,
qty: null,
pcsn: null,

8
wms_pro/qd/src/views/wms/early_manage/early_inv/index.vue
View File

@@ -178,10 +178,10 @@ const defaultForm = {
form_desc: null,
create_time: null,
create_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
bus_status: null,
biz_id: null,
biz_code: null,
biz_date: null,
biz_status: null,
material_id: null,
qty: null,
pcsn: null,

9
wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js
View File

@@ -75,6 +75,12 @@ export function changeActive(data) {
data
})
}
export function flowConfirm(inst_id) {
return request({
url: 'api/bpmnExecution/confirm/'+inst_id,
method: 'get',
})
}
export default {
add,
@@ -86,5 +92,6 @@ export default {
publish,
queryByParentId,
getDeploymentById,
changeActive
changeActive,
flowConfirm
}

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

@@ -11,6 +11,15 @@
prefix-icon="el-icon-search"
class="filter-item"
/>
<el-input
v-model="query.proc_inst_id"
clearable
style="width: 300px"
size="mini"
placeholder="输入实例id"
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation/>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
@@ -35,10 +44,13 @@
<el-form-item label="实例状态" prop="status">
<el-input v-model="form.status" style="width: 300px;"/>
</el-form-item>
<el-form-item label="业务类型" prop="form_type">
<el-form-item label="表单类型" prop="form_type">
<el-input v-model="form.form_type" style="width: 300px;"/>
</el-form-item>
<el-form-item label="业务数据" prop="form_data">
<el-form-item label="表单id" prop="form_type">
<el-input v-model="form.form_id" style="width: 300px;"/>
</el-form-item>
<el-form-item label="表单数据" prop="form_data">
<el-input type="textarea" v-model="form.form_data" style="width: 300px;"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
@@ -90,9 +102,9 @@
</template>
</el-table-column>
<el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
<el-table-column prop="form_id" show-overflow-tooltip show-tooltip-when-overflow width="130" label="业务主键"/>
<el-table-column prop="form_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="业务类型"/>
<el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="业务数据" :formatter="jsonFormat"/>
<el-table-column prop="form_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单类型"/>
<el-table-column prop="form_id" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单id"/>
<el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="表单数据" :formatter="jsonFormat"/>
<el-table-column prop="create_id" label="创建人" width="135"/>
<el-table-column prop="create_time" label="创建时间" width="135"/>
<el-table-column prop="update_time" label="修改时间" width="135"/>
@@ -100,7 +112,7 @@
v-permission="['admin','actDeModel:edit','actDeModel:del']"
fixed="right"
label="操作"
width="160px"
width="210px"
align="center"
>
<template slot-scope="scope">
@@ -109,6 +121,7 @@
:permission="permission"
style="display: inline"
/>
<el-button slot="right" @click="flowConfirm(scope.row.proc_inst_id)" type="text" icon="el-icon-video-play" size="mini">触发</el-button>
<el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览</el-button>
</template>
</el-table-column>
@@ -207,6 +220,11 @@ export default {
this.$refs.viewCurrentFlowDesigner.showLogicFlowDesigner(res.model_editor_json, row);
})
},
flowConfirm(proc_inst_id) {
curdExecution.flowConfirm(proc_inst_id).then(res => {
crud.notify("操作成功", CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve(tree.children)

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

@@ -195,7 +195,6 @@ const defaultForm = {
update_name: '',
update_time: '',
status: '',
tableData: [],
form_data: {}
}
@@ -263,7 +262,6 @@ export default {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return true
}
debugger
this.form.item = this.tableData
},
deleteRow(index, rows) {
@@ -284,7 +282,29 @@ export default {
})
this.form.child_qty = this.tableData.length
},
tableDtlMaterial2(rows) {
tableDtlMaterial2(data) {
debugger
let mst = data['t'];
let rows = data['item'];
this.form.source_form_type = mst.form_type
this.form.source_form_id = mst.id
let mst_form_data = mst.form_data;
this.cols.forEach(a=>{
let item = null
if (a.value in mst_form_data) {
item = mst_form_data[a.value];
}
// let keys = Object.keys(mst_form_data);
// for (let i = 0; i < keys.length; i++) {
// let key = keys[i];
// if (a.value == key) {
// item = mst_form_data[a.value];
// break
// }
// }
this.$set(this.form.form_data,a.value,item)
})
rows.forEach((row) => {
const data = {}
data.material_name = row.material_name
@@ -327,7 +347,6 @@ export default {
},
unitFormatter(row) {
debugger
if (row.unit_id!=null){
for (let i = 0; i < this.unitDict.length; i++) {
let item = this.unitDict[i];

12
wms_pro/qd/src/views/wms/md_manage/group_dick/group_config/index.vue
View File

@@ -25,9 +25,9 @@
<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="biz_id" label="业务单据id映射" />
<el-table-column prop="biz_code" label="业务单据code映射" />
<el-table-column prop="biz_date" label="业务单据时间映射" />
<el-table-column prop="status" label="业务单据状态映射" />
<el-table-column prop="material_id" label="物料id映射" />
<el-table-column prop="qty" label="物料数量映射" />
@@ -52,9 +52,9 @@ const defaultForm = {
create_time: null,
has_child: null,
parent_id: null,
bus_id: null,
bus_code: null,
bus_date: null,
biz_id: null,
biz_code: null,
biz_date: null,
status: null,
material_id: null,
qty: null,

13
wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
View File

@@ -139,14 +139,17 @@ import ViewDialog from '@/views/wms/md_manage/group_dick/ViewDialog'
const defaultForm = {
id: '',
code: '',
parent_vehicle_code: '',
child_qty: '0',
remark: '0',
status: '',
source_form_id: '',
source_form_type: '',
remark: '',
update_name: '',
update_time: '',
status: '',
tableData: [],
form_data: null
create_time: '',
proc_inst_id: '',
form_data: {}
}
export default {
name: 'DeliveryOrder',

11
wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue
View File

@@ -53,6 +53,7 @@
@select="crud.selectChange"
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
@current-change="clickChange"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="210px">
@@ -237,8 +238,11 @@ export default {
// 处理单选
if (this.isSingle && this.tableRadio) {
this.dialogVisible = false
let subData = {}
this.$set(subData, 't', this.form)
this.$set(subData, 'item', this.tableRadio)
this.$emit('update:dialogShow', false)
this.$emit('setMaterValue', this.tableRadio)
this.$emit('setMaterValue', subData)
return
}
this.rows = this.$refs.table.selection
@@ -248,7 +252,10 @@ export default {
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('setMaterValue', this.rows[0].children)
let subData = {}
this.$set(subData, 't', this.rows[0])
this.$set(subData, 'item', this.rows[0].children)
this.$emit('setMaterValue', subData)
},
}
}