Skip to content

I
ibzwf
提交 2fa7c2f1 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong 发布系统代码 [ibz-wf，统一工作流]

上级 50982c3c
显示空白字符变更
内嵌 并排
正在显示 包含 63 行增加 和 103 行删除
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts
浏览文件 @ 2fa7c2f1
......@@ -45,10 +45,10 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
},
......
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts
浏览文件 @ 2fa7c2f1
......@@ -45,10 +45,10 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
},
......
app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts
浏览文件 @ 2fa7c2f1
......@@ -45,10 +45,10 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
definitionkey: commonLogic.appcommonhandle("流程定义标识",null),
instancename: commonLogic.appcommonhandle("实例名称",null),
businesskey: commonLogic.appcommonhandle("业务键值",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
starttime: commonLogic.appcommonhandle("启动时间",null),
startuserid: commonLogic.appcommonhandle("发起人标识",null),
},
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_BO_CN_base.ts
浏览文件 @ 2fa7c2f1
......@@ -24,8 +24,6 @@ function getLocaleResourceBase(){
columns: {
nodeid: commonLogic.appcommonhandle("节点标识",null),
nodename: commonLogic.appcommonhandle("节点名称",null),
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_en_US_base.ts
浏览文件 @ 2fa7c2f1
......@@ -24,8 +24,6 @@ function getLocaleResourceBase(){
columns: {
nodeid: commonLogic.appcommonhandle("节点标识",null),
nodename: commonLogic.appcommonhandle("节点名称",null),
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_zh_CN_base.ts
浏览文件 @ 2fa7c2f1
......@@ -24,8 +24,6 @@ function getLocaleResourceBase(){
columns: {
nodeid: commonLogic.appcommonhandle("节点标识",null),
nodename: commonLogic.appcommonhandle("节点名称",null),
definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
definitionname: commonLogic.appcommonhandle("流程定义名称",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/widgets/wfgroup/main-grid/main-grid-base.vue
浏览文件 @ 2fa7c2f1
......@@ -306,6 +306,20 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0];
}
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/**
* 是否嵌入关系界面
......@@ -810,7 +824,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(pageReset){
......@@ -905,7 +919,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1011,7 +1025,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public addBatch(arg: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(!arg){
......@@ -1798,7 +1812,7 @@ export default class MainBase extends Vue implements ControlInterface {
public setColState() {
this.resetColModel = Util.deepCopy(this.allColumns);
const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main'});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgroupgridview_grid_main'});
const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if(response.status == 200 && response.data) {
......@@ -1865,7 +1879,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public saveDynaConfig() {
const viewParams: any = Util.deepCopy(this.viewparams);
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main', model: this.allColumns});
Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgroupgridview_grid_main', model: this.allColumns});
const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
post.then((response: any) => {
if (response.status == 200) {
......@@ -1936,7 +1950,7 @@ export default class MainBase extends Vue implements ControlInterface {
try {
if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
......@@ -1944,7 +1958,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.wfgroup){
......@@ -2017,7 +2031,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return;
}
let _this = this;
......
app_web/src/widgets/wfprocess-instance/main-grid/main-grid-base.vue
浏览文件 @ 2fa7c2f1
......@@ -22,6 +22,18 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('definitionname')">
<el-table-column show-overflow-tooltip :prop="'definitionname'" :label="$t('entities.wfprocessinstance.main_grid.columns.definitionname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessinstance.main_grid.columns.definitionname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.definitionname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('definitionkey')">
<el-table-column show-overflow-tooltip :prop="'definitionkey'" :label="$t('entities.wfprocessinstance.main_grid.columns.definitionkey')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -47,7 +59,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('businesskey')">
<el-table-column show-overflow-tooltip :prop="'businesskey'" :label="$t('entities.wfprocessinstance.main_grid.columns.businesskey')" :width="200" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'businesskey'" :label="$t('entities.wfprocessinstance.main_grid.columns.businesskey')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessinstance.main_grid.columns.businesskey')}}
......@@ -58,18 +70,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('definitionname')">
<el-table-column show-overflow-tooltip :prop="'definitionname'" :label="$t('entities.wfprocessinstance.main_grid.columns.definitionname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessinstance.main_grid.columns.definitionname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.definitionname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('starttime')">
<el-table-column show-overflow-tooltip :prop="'starttime'" :label="$t('entities.wfprocessinstance.main_grid.columns.starttime')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -639,9 +639,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public allColumns: any[] = [
{
name: 'definitionname',
label: '流程定义名称',
langtag: 'entities.wfprocessinstance.main_grid.columns.definitionname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'definitionkey',
label: 'DefinitionKey',
label: '流程定义标识',
langtag: 'entities.wfprocessinstance.main_grid.columns.definitionkey',
show: true,
unit: 'PX',
......@@ -666,15 +675,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'definitionname',
label: '流程定义名称',
langtag: 'entities.wfprocessinstance.main_grid.columns.definitionname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'starttime',
label: '启动时间',
......@@ -1400,7 +1400,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['definitionkey','instancename','businesskey','definitionname','starttime','startuserid'];
let allColumns:Array<any> = ['definitionname','definitionkey','instancename','businesskey','starttime','startuserid'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1480,10 +1480,10 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
definitionname:'',
starttime:'',
startuserid:'',
children: children
......@@ -1512,10 +1512,10 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
definitionname:'',
starttime:'',
startuserid:'',
children: child
......@@ -1564,10 +1564,10 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
definitionname:'',
definitionkey:'',
instancename:'',
businesskey:'',
definitionname:'',
starttime:'',
startuserid:'',
children: children,
......
app_web/src/widgets/wfprocess-instance/main-grid/main-grid-model.ts
浏览文件 @ 2fa7c2f1
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'definitionname',
prop: 'processdefinitionname',
dataType: 'TEXT',
},
{
name: 'definitionkey',
prop: 'processdefinitionkey',
......@@ -41,11 +46,6 @@ export default class MainModel {
prop: 'businesskey',
dataType: 'TEXT',
},
{
name: 'definitionname',
prop: 'processdefinitionname',
dataType: 'TEXT',
},
{
name: 'starttime',
prop: 'starttime',
......
app_web/src/widgets/wfprocess-node/main-grid/main-grid-base.vue
浏览文件 @ 2fa7c2f1
......@@ -23,7 +23,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('nodeid')">
<el-table-column show-overflow-tooltip :prop="'nodeid'" :label="$t('entities.wfprocessnode.main_grid.columns.nodeid')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'nodeid'" :label="$t('entities.wfprocessnode.main_grid.columns.nodeid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessnode.main_grid.columns.nodeid')}}
......@@ -35,7 +35,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('nodename')">
<el-table-column show-overflow-tooltip :prop="'nodename'" :label="$t('entities.wfprocessnode.main_grid.columns.nodename')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'nodename'" :label="$t('entities.wfprocessnode.main_grid.columns.nodename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessnode.main_grid.columns.nodename')}}
......@@ -46,30 +46,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('definitionkey')">
<el-table-column show-overflow-tooltip :prop="'definitionkey'" :label="$t('entities.wfprocessnode.main_grid.columns.definitionkey')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessnode.main_grid.columns.definitionkey')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.definitionkey}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('definitionname')">
<el-table-column show-overflow-tooltip :prop="'definitionname'" :label="$t('entities.wfprocessnode.main_grid.columns.definitionname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.wfprocessnode.main_grid.columns.definitionname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.definitionname}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -633,24 +609,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'definitionkey',
label: 'DefinitionKey',
langtag: 'entities.wfprocessnode.main_grid.columns.definitionkey',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'definitionname',
label: '流程定义名称',
langtag: 'entities.wfprocessnode.main_grid.columns.definitionname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1358,7 +1316,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['nodeid','nodename','definitionkey','definitionname'];
let allColumns:Array<any> = ['nodeid','nodename'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1440,8 +1398,6 @@ export default class MainBase extends Vue implements ControlInterface {
group: group.label,
nodeid:'',
nodename:'',
definitionkey:'',
definitionname:'',
children: children
}
groupTree.push(tree);
......@@ -1470,8 +1426,6 @@ export default class MainBase extends Vue implements ControlInterface {
group: this.$t('app.gridpage.other'),
nodeid:'',
nodename:'',
definitionkey:'',
definitionname:'',
children: child
}
if(child && child.length > 0){
......@@ -1520,8 +1474,6 @@ export default class MainBase extends Vue implements ControlInterface {
group: group,
nodeid:'',
nodename:'',
definitionkey:'',
definitionname:'',
children: children,
}
groupTree.push(tree);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或