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

app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_BO_CN_base.ts

@@ -22,6 +22,10 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			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

@@ -22,6 +22,10 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			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

@@ -22,6 +22,10 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			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

@@ -306,20 +306,6 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -824,7 +810,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -919,7 +905,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1025,7 +1011,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1812,7 +1798,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_wfgroupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1879,7 +1865,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_wfgroupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1950,7 +1936,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(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);
@@ -1958,7 +1944,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.wfgroup){
@@ -2031,7 +2017,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: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/wfprocess-node/main-grid/main-grid-base.vue

@@ -22,6 +22,54 @@
             <template v-if="!isSingleSelect">
                 <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'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.wfprocessnode.main_grid.columns.nodeid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.nodeid}}</span>
+                    </template>
+                </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'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.wfprocessnode.main_grid.columns.nodename')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.nodename}}</span>
+                    </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>
@@ -222,7 +270,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */  
-    public majorInfoColName:string = "";
+    public majorInfoColName:string = "nodename";
 
     /**
      * 界面UI服务对象
@@ -567,6 +615,42 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public allColumns: any[] = [
+        {
+            name: 'nodeid',
+            label: '节点标识',
+            langtag: 'entities.wfprocessnode.main_grid.columns.nodeid',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'nodename',
+            label: '节点名称',
+            langtag: 'entities.wfprocessnode.main_grid.columns.nodename',
+            show: true,
+            unit: 'PX',
+            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 ,
+        },
     ]
 
     /**
@@ -1274,7 +1358,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = [];
+        let allColumns:Array<any> = ['nodeid','nodename','definitionkey','definitionname'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1354,6 +1438,10 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((i+1)*100),
                 group: group.label,
+                nodeid:'',
+                nodename:'',
+                definitionkey:'',
+                definitionname:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1380,6 +1468,10 @@ export default class MainBase extends Vue implements ControlInterface {
         const Tree: any = {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
+            nodeid:'',
+            nodename:'',
+            definitionkey:'',
+            definitionname:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1426,6 +1518,10 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((groupIndex+1)*100),
                 group: group,
+                nodeid:'',
+                nodename:'',
+                definitionkey:'',
+                definitionname:'',
                 children: children,
             }
             groupTree.push(tree);
@@ -1912,10 +2008,16 @@ export default class MainBase extends Vue implements ControlInterface {
                             });
                         }
                     } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        let name: string = this.service.getNameByProp("nodeid");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
                             this.$Notice.error({
-                            title: (this.$t('app.commonWords.saveFailed') as string),
-                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
                             });
+                        }
                     }else {
                         this.$Notice.error({
                             title: (this.$t('app.commonWords.saveFailed') as string),
@@ -2024,6 +2126,7 @@ export default class MainBase extends Vue implements ControlInterface {
             return;
         }
         let tempContext: any = this.$util.deepCopy(this.context);
+        Object.is(tempContext, { wfprocessnode: data.nodeid });
         const arg: any = JSON.parse(JSON.stringify(data));
         Object.assign(arg,{viewparams:this.viewparams});
         const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);

app_web/src/widgets/wfprocess-node/main-grid/main-grid-model.ts

@@ -26,6 +26,26 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'nodeid',
+          prop: 'usertaskid',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'nodename',
+          prop: 'usertaskname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'definitionkey',
+          prop: 'processdefinitionkey',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'definitionname',
+          prop: 'processdefinitionname',
+          dataType: 'TEXT',
+        },
         {
           name: 'srfkey',
           prop: 'usertaskid',