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

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts

@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
 				instancename: commonLogic.appcommonhandle("实例名称",null),
 				businesskey: commonLogic.appcommonhandle("业务键值",null),
 				definitionname: commonLogic.appcommonhandle("流程定义名称",null),

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts

@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
 				instancename: commonLogic.appcommonhandle("实例名称",null),
 				businesskey: commonLogic.appcommonhandle("业务键值",null),
 				definitionname: commonLogic.appcommonhandle("流程定义名称",null),

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts

@@ -44,6 +44,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
 				instancename: commonLogic.appcommonhandle("实例名称",null),
 				businesskey: commonLogic.appcommonhandle("业务键值",null),
 				definitionname: commonLogic.appcommonhandle("流程定义名称",null),

app_web/src/pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view-base.vue

@@ -144,7 +144,6 @@ export default class WFProcessInstanceActiveInstanceOptionViewBase extends Vue {
 	 * @memberof WFProcessInstanceActiveInstanceOptionViewBase
 	 */
     public customViewParams:any ={
-    "processdefinitionkey":{"isRawValue":false,"value":"processdefinitionkey"}
     };
 
     /**

app_web/src/uiservice/wfprocess-instance/wfprocess-instance-ui-service-base.ts

@@ -134,7 +134,7 @@ export default class WFProcessInstanceUIServiceBase extends UIService {
         let parentContext:any = {};
         let parentViewParam:any = {};
         const _this: any = actionContext;
-        Object.assign(context,{PROCESSDEFINITIONKEY:"%processdefinitionkey%"});
+        Object.assign(params,{processdefinitionkey:"%processdefinitionkey%"});
         const _args: any[] = Util.deepCopy(args);
         const actionTarget: string | null = 'SINGLEKEY';
         Object.assign(context, { wfprocessinstance: '%wfprocessinstance%' });

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

@@ -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('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}">
+                      <span class="column-header ">
+                        {{$t('entities.wfprocessinstance.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('instancename')">
                 <el-table-column show-overflow-tooltip :prop="'instancename'" :label="$t('entities.wfprocessinstance.main_grid.columns.instancename')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -627,6 +639,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public allColumns: any[] = [
+        {
+            name: 'definitionkey',
+            label: 'DefinitionKey',
+            langtag: 'entities.wfprocessinstance.main_grid.columns.definitionkey',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'instancename',
             label: '实例名称',
@@ -1379,7 +1400,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['instancename','businesskey','definitionname','starttime','startuserid'];
+        let allColumns:Array<any> = ['definitionkey','instancename','businesskey','definitionname','starttime','startuserid'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1459,6 +1480,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((i+1)*100),
                 group: group.label,
+                definitionkey:'',
                 instancename:'',
                 businesskey:'',
                 definitionname:'',
@@ -1490,6 +1512,7 @@ export default class MainBase extends Vue implements ControlInterface {
         const Tree: any = {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
+            definitionkey:'',
             instancename:'',
             businesskey:'',
             definitionname:'',
@@ -1541,6 +1564,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((groupIndex+1)*100),
                 group: group,
+                definitionkey:'',
                 instancename:'',
                 businesskey:'',
                 definitionname:'',

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

@@ -26,6 +26,11 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'definitionkey',
+          prop: 'processdefinitionkey',
+          dataType: 'TEXT',
+        },
         {
           name: 'instancename',
           prop: 'name',

app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue

@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -662,7 +662,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/wfuser/main-grid/main-grid-base.vue

@@ -330,6 +330,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;
     
     /**
     * 是否嵌入关系界面
@@ -852,7 +866,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -947,7 +961,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1053,7 +1067,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1846,7 +1860,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_wfuserpickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfusergridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1913,7 +1927,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_wfuserpickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfusergridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1984,7 +1998,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(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);
@@ -1992,7 +2006,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.wfuser){
@@ -2065,7 +2079,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: 'WFUserPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;