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

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)