rev:修改多层子流程时透传函数套娃问题;

add:网关添加自动功能作为空节点使用
This commit is contained in:
zhangzq
2024-07-08 15:14:19 +08:00
parent 9a16d8be85
commit 7607eeb6f4
32 changed files with 522 additions and 55 deletions

View File

@@ -12,7 +12,7 @@
>
<el-form-item label="所属仓库">
<el-select
v-model="query.stor_id"
v-model="query.stor_code"
clearable
class="filter-item"
placeholder="所属仓库"
@@ -20,9 +20,9 @@
>
<el-option
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.stor_code"
:label="item.stor_name"
:value="item.stor_code"
/>
</el-select>
</el-form-item>
@@ -71,17 +71,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属仓库" prop="id">
<el-form-item label="归属仓库" prop="stor_code">
<el-select
v-model="form.id"
v-model="form.stor_code"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.id"
:key="item.stor_code"
:label="item.stor_name"
:value="item.id"
:value="item.stor_code"
/>
</el-select>
</el-form-item>
@@ -231,7 +231,7 @@ const defaultForm = {
export default {
name: 'Sectattr',
dicts: ['st_sect_type', 'is_used'],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#id' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

View File

@@ -11,7 +11,7 @@
>
<el-form-item label="所属仓库">
<el-select
v-model="query.stor_id"
v-model="query.stor_code"
clearable
class="filter-item"
placeholder="所属仓库"
@@ -322,7 +322,7 @@ export default {
name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type'],
statusEnums: ['LOCK'],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#id' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

View File

@@ -88,7 +88,7 @@
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="220" label="流程实例">
<el-table-column prop="proc_inst_id" show-overflow-tooltip show-tooltip-when-overflow width="260" label="流程实例">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.proc_inst_id }}</el-link>
</template>

View File

@@ -191,7 +191,7 @@
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
:label="item.lable">
<template slot-scope="scope">
<el-switch v-if="item.value == 'is_artificiality'"
<el-switch v-if="item.value == 'is_move'"
v-model="tabledis[scope.$index].form_data[item.value]"
active-color="#409EFF"
inactive-color="#F56C6C"