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-17 16:22:23 +08:00
parent c8439abd23
commit c5c93d73ee
49 changed files with 1174 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,14 +64,14 @@
style="width: 100%;"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="proc_inst_id" show-overflow-tooltip show-tooltip-when-overflow width="200" label="流程标识"/>
<el-table-column prop="proc_inst_id" show-overflow-tooltip show-tooltip-when-overflow width="200" label="流程实例"/>
<el-table-column prop="parent_id" width="200" label="父流程"/>
<el-table-column v-if="false" prop="deployment_id" label="当前实例标识"/>
<el-table-column v-if="false" prop="deployment_id" label="流程部署ID"/>
<el-table-column prop="deployment_name" show-overflow-tooltip show-tooltip-when-overflow width="130"
label="当前实例名称"/>
<el-table-column v-if="false" prop="activity_id" label="当前实例节点"/>
label="流程模型"/>
<el-table-column v-if="false" prop="activity_id" label="当前节点ID"/>
<el-table-column prop="activity_name" show-overflow-tooltip show-tooltip-when-overflow width="130"
label="当前实例节点名称"/>
label="当前节点"/>
<el-table-column prop="is_active" label="启用">
<template slot-scope="scope">
<el-switch
@@ -86,21 +86,13 @@
</el-table-column>
<el-table-column prop="status" label="实例状态">
<template slot-scope="scope">
<span
v-for="(item, index) in statusList"
:key="index"
:value="item.value"
v-if="scope.row.status == item.value"
>
{{ item.label }}
</span>
{{ dict.label.FLOW_STATUS[scope.row.status] }}
</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"
show-overflow-tooltip show-tooltip-when-overflow label="业务数据"/>
<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"/>
@@ -154,7 +146,7 @@ const defaultForm = {
form_data: null
}
export default {
dicts: [],
dicts: [ "FLOW_STATUS" ],
name: 'Execution',
components: {pagination, crudOperation, rrOperation, udOperation, ViewCurrentFlowDesigner},
mixins: [presenter(), header(), form(defaultForm), crud()],
@@ -204,6 +196,12 @@ export default {
this.form.form_data = JSON.stringify(this.form.form_data)
return true
},
jsonFormat(row, index) {
if (row.form_data != null) {
return JSON.stringify(row.form_data)
}
return ''
},
viewClick(row) {
curdExecution.getDeploymentById(row.deployment_id).then(res => {
this.$refs.viewCurrentFlowDesigner.showLogicFlowDesigner(res.model_editor_json, row);

3
wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
View File

@@ -29,6 +29,9 @@
<el-form-item label="模型描述">
<el-input v-model="form.description" style="width: 370px;"/>
</el-form-item>
<el-form-item label="模型KEY">
<el-input v-model="form.model_key" style="width: 370px;"/>
</el-form-item>
<el-form-item label="模型注释">
<el-input v-model="form.model_comment" style="width: 370px;"/>
</el-form-item>