JunZai 发布系统代码

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts

@@ -396,8 +396,8 @@ export default {
 			tip: "",
 		},
 		tbitem9_saveandstart: {
-			caption: "开始",
-			tip: "开始",
+			caption: "开始流程",
+			tip: "开始流程",
 		},
 		tbitem10: {
 			caption: "Workflow step",

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts

@@ -395,8 +395,8 @@ export default {
 			tip: "",
 		},
 		tbitem9_saveandstart: {
-			caption: "开始",
-			tip: "开始",
+			caption: "开始流程",
+			tip: "开始流程",
 		},
 		tbitem10: {
 			caption: "当前流程步骤",

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view-base.tsx

@@ -110,7 +110,7 @@ export class HRTransferApplyWFDynaEditViewBase extends ViewBase {
         tbitem7: { name: 'tbitem7', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY', class: '' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem9_saveandstart: { name: 'tbitem9_saveandstart', caption: '开始', 'isShowCaption': true, 'isShowIcon': true, tooltip: '开始', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '', class: '' } },
+        tbitem9_saveandstart: { name: 'tbitem9_saveandstart', caption: '开始流程', 'isShowCaption': true, 'isShowIcon': true, tooltip: '开始流程', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '', class: '' } },
 
         tbitem10: { name: 'tbitem10', caption: '当前流程步骤', 'isShowCaption': true, 'isShowIcon': true, tooltip: '当前流程步骤', iconcls: 'sx-tb-stepactor', icon: '../sasrfex/images/default/icon_stepactor.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'ViewWFStep', target: 'SINGLEKEY', class: '' } },
 
@@ -636,7 +636,7 @@ export class HRTransferApplyWFDynaEditViewBase extends ViewBase {
         }
     }
     /**
-     * 开始
+     * 开始流程
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html

-!!!!模版产生代码错误:Syntax error in template "TEMPLCODE_en_US" in line 55, column 72:
-Unexpected end of file reached. You have an unclosed #if.
\ No newline at end of file
+<studio-view-style2 viewName="hrtransferapplywfdynaexpgridview" viewTitle="调动申请工作流导航表格视图" class='dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{viewCaption}}</span>
+    </template>
+    <split id="hrtransferapplywfdynaexpgridview" v-model="split" mode="horizontal">
+        <div slot='left'>
+            <el-tree ref="tree" :data="wfStepModel" node-key="userTaskId" :highlight-current="true" :props="defaultProps" @node-click="handleNodeClick.apply(_self, arguments)"></el-tree>
+        </div>
+        <div slot="right">
+            <div class="content-container">
+                <studio-view-style2>
+                    <template slot="toolbar">
+                                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>                    </template>
+                    <template slot="searchForm">
+                        <view_searchform 
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context" 
+    :showBusyIndicator="true"
+    v-show="isExpandSearchForm"
+    loaddraftAction="FilterGetDraft"
+    loadAction="FilterGet"
+
+    name="searchform"  
+    ref='searchform' 
+    @save="searchform_save($event)"  
+    @search="searchform_search($event)"  
+    @load="searchform_load($event)"  
+    @closeview="closeView($event)">
+</view_searchform>
+                    </template>
+                    <view_grid 
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context" 
+    :isSingleSelect="isGridSingleSelect"
+    :showBusyIndicator="true"
+    updateAction=""
+    removeAction="Remove"
+    loaddraftAction=""
+    loadAction=""
+    createAction=""
+    fetchAction="FetchDefault"
+    :newdata="newdata.bind(_self)"
+    :opendata="opendata.bind(_self)"
+    name="grid"  
+    ref='grid' 
+    @selectionchange="grid_selectionchange($event)"  
+    @beforeload="grid_beforeload($event)"  
+    @rowdblclick="grid_rowdblclick($event)"  
+    @remove="grid_remove($event)"  
+    @load="grid_load($event)"  
+    @closeview="closeView($event)">
+</view_grid>
+                </studio-view-style2>
+            </div>
+        </div>
+    </split>
+</studio-view-style2>
\ No newline at end of file

humanresource-core/src/main/resources/workflow/TransferApplicationApprovalv1.bpmn

@@ -57,7 +57,7 @@
      <userTask flowable:category="${businessKey}"  flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-50-2460008b701052acd8ecac24c4d32104" name="调入单位董事长审批" >
         <documentation>${majortext}</documentation>
      </userTask>
-     <startEvent id="sid-0c0b39a1bdc3bc642bd55e20074e3366" name="开始"/>
+     <startEvent id="sid-0c0b39a1bdc3bc642bd55e20074e3366" name="开始流程"/>
      <userTask flowable:category="${businessKey}"  flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-10-61fa76aef8b148d06d26738ab8df9c5c" name="申请人" >
         <documentation>${majortext}</documentation>
      </userTask>