JunZai 发布系统代码

74f9a336 · ibizdev · 050e0dae · 74f9a336 · 74f9a336 · 74f9a336
--- a/app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
+++ b/app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
+
 <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"></el-tree>
-        </div>
-        <div slot="right">
-            <div class="content-container">
-            <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>
-            <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>
-            </div>
-        </div>
-    </split>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="调动申请名称" search @on-search="onSearch($event)"/>
+    <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>
+    <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"></el-tree>
+        </div>
+        <div slot="right">
+            <div class="content-container">
+            <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>
+            <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>
+            </div>
+        </div>
+    </split>
 </studio-view-style2>
\ No newline at end of file
--- a/app_PIM/src/styles/default.less
+++ b/app_PIM/src/styles/default.less
@@ -1292,4 +1292,47 @@ div::-webkit-scrollbar-thumb {
        color: var(--form-editor-font-color);
    }
 }
+
+// 工作流动态导航表格视图
+.dewfdynaexpgridview{
+    .el-tree {
+        padding-right: 10px;
+    }
+    .el-tree-node__content {
+        height: 40px;
+        border-left: solid transparent;
+
+    }
+    .el-tree-node__label {
+        font-size: 15px;
+        font-family: "Microsoft YaHei";
+    }
+    .el-tree-node {
+        margin-top: 10px;
+    }
+    .el-tree-node:nth-child(1) {
+        margin-top: 0px;
+    }
+    .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+        background-color: #f0f7ff;
+        border-color:  #1890ff6e;
+    }
+    .ivu-split-horizontal {
+        .ivu-split-pane >div {
+            height: 100%;
+            overflow-y: auto;
+            .content-container {
+                height: 100%;
+                display: -webkit-box;
+                display: -ms-flexbox;
+                display: flex;
+                margin: 0;
+                -webkit-box-orient: vertical;
+                -webkit-box-direction: normal;
+                -ms-flex-direction: column;
+                flex-direction: column;
+            }
+        }
+    }
+}
 @import './user.less';
\ No newline at end of file
--- a/app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form-base.tsx
+++ b/app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form-base.tsx
@@ -135,7 +135,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
     * @memberof EF_001EditFormBase
     */
    public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '档案信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrarchives.ef_001_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '档案信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrarchives.ef_001_form', extractMode: 'ITEM', details: [] } }),

        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),


--- a/app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form.html
+++ b/app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form.html
@@ -3,7 +3,7 @@
    <row >
            
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrarchives.ef_001_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrarchives.ef_001_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
    <row>
        <i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
@@ -102,21 +102,8 @@
 </i-col>
 <i-col class="form-layout-container" v-show="detailsModel.activeflag.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
    <app-form-item name='activeflag' :itemRules="this.rules.activeflag" class='' :caption="$t('entities.hrarchives.ef_001_form.details.activeflag')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.activeflag.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<dropdown-list 
-    v-model="data.activeflag"
-    :data="data"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.activeflag.disabled"
-    style="width:100px;width: 100px;"
-    valueType="number"
-    tag='YesNo' 
-    codelistType='STATIC'
-    placeholder='请选择...'
-/>
+    <app-switch name='activeflag' :value="this.data.activeflag" @change="($event)=>{this.data.activeflag = $event} " :disabled="detailsModel.activeflag.disabled" style=""></app-switch>
+
 </app-form-item>

 </i-col>

--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizhumanresources/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibizhumanresources/
-      mvn clean package -Ppim
-      cd humanresource-app/humanresource-app-pim
-      mvn -Ppim docker:build
-      mvn -Ppim docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
+++ b/humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar

-EXPOSE 10327
+EXPOSE 8080

 ADD humanresource-app-pim.jar /humanresource-app-pim.jar
--- a/humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
+++ b/humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
@@ -3,25 +3,9 @@ services:
  humanresource-app-pim:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
    ports:
-      - "10327:10327"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10327
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
    deploy:
      resources:
           limits: