ibizdev提交

app_web/src/components/app-form-group/app-form-group.vue

@@ -131,6 +131,14 @@ export default class AppFormGroup extends Vue {
      */    
     @Prop() public titleStyle?:string;
 
+    /**
+     * 分组图标
+     *
+     * @type {string}
+     * @memberof AppFormGroup
+     */ 
+    @Prop() public iconInfo?:any;
+
     /**
      * 是否显示标题
      *

app_web/src/components/app-span/app-span.vue

@@ -9,7 +9,7 @@ import { Vue, Component, Prop, Watch, Model } from 'vue-property-decorator';
 import CodeListService from "@service/app/codelist-service";
 
 @Component({})
-export default class DropDownList extends Vue {
+export default class AppSpan extends Vue {
 
     /**
      * 当前值
@@ -46,21 +46,21 @@ export default class DropDownList extends Vue {
     /**
      * 获取或模式
      * @type {boolean}
-     * @memberof SelectPicker
+     * @memberof AppSpan
      */
     @Prop({default:"STR"}) public renderMode?: string;
 
     /**
      * 文本分隔符
      * @type {boolean}
-     * @memberof SelectPicker
+     * @memberof AppSpan
      */
     @Prop({default:"、"}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
-     * @memberof SelectPicker
+     * @memberof AppSpan
      */
     @Prop({default:";"}) public valueSeparator?: string;
 

app_web/src/pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view-base.vue

 <template>
-<div class="view-container ibzdepartment-edit-view">
+<div class="view-container deeditview ibzdepartment-edit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmenteditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -758,6 +758,8 @@ export default class IBZDepartmentEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

 <template>
-    <div class='view-container ibzdepartment-grid-view'>
+    <div class='view-container degridview ibzdepartment-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentgridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view-base.vue

 <template>
-<div class='view-container ibzdepartment-pickup-grid-view'>
+<div class='view-container depickupgridview ibzdepartment-pickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view-base.vue

 <template>
-<div class="view-container ibzdepartment-pickup-view">
+<div class="view-container depickupview ibzdepartment-pickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/pages/ou/ibzemployee-change-pwd-view/ibzemployee-change-pwd-view-base.vue

 <template>
-<div class="view-container ibzemployee-change-pwd-view">
+<div class="view-container deeditview ibzemployee-change-pwd-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeechangepwdview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 

app_web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue

 <template>
-<div class="view-container ibzemployee-edit-view">
+<div class="view-container deeditview ibzemployee-edit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeeeditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -758,6 +758,8 @@ export default class IBZEmployeeEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

 <template>
-    <div class='view-container ibzemployee-grid-view'>
+    <div class='view-container degridview ibzemployee-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeegridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/ou/ibzorganization-edit-view/ibzorganization-edit-view-base.vue

 <template>
-<div class="view-container ibzorganization-edit-view">
+<div class="view-container deeditview ibzorganization-edit-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationeditview"></app-studioaction>
     <card class='view-card ' :disHover="true" :bordered="false">
 
@@ -758,6 +758,8 @@ export default class IBZOrganizationEditViewBase extends Vue {
             if (_this.viewdata) {
                 _this.$emit('viewdataschange', [{ ..._data }]);
                 _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
             }
         });
     }

app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

 <template>
-    <div class='view-container ibzorganization-grid-view'>
+    <div class='view-container degridview ibzorganization-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationgridview"></app-studioaction>
     <card class='view-card'  :dis-hover="true" :bordered="false">
         <p slot='title'>

app_web/src/pages/ou/ibzorganization-option-view/ibzorganization-option-view-base.vue

 <template>
-<div class="view-container ibzorganization-option-view">
+<div class="view-container deoptview ibzorganization-option-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationoptionview"></app-studioaction>
     <card class='view-card' dis-hover :padding="0" :bordered="false">
         <p slot='title'>

app_web/src/pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view-base.vue

 <template>
-<div class='view-container ibzorganization-pickup-grid-view'>
+<div class='view-container depickupgridview ibzorganization-pickup-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>

app_web/src/pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view-base.vue

 <template>
-<div class="view-container ibzorganization-pickup-view">
+<div class="view-container depickupview ibzorganization-pickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationpickupview"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">

app_web/src/styles/default.less

@@ -208,4 +208,52 @@
 }
 /***    END:多数据视图属性布局    ***/
 
+// 看板视图，卡片模式
+.view-container.appportalview,.view-container.deportalview,.view-container.deportalview9{
+  >.view-card>.ivu-card-body>.content-container{
+    background: #efefef;
+  }
+  .dashboard{
+    padding: 8px;
+  }
+  .portlet-container{
+    background: #efefef;
+  }
+  .portlet-container::after{
+    content: "";
+    clear: both;
+  }
+  .portlet{
+    margin: 8px;
+    height: calc(100% - 16px);
+    width: calc(100% - 16px);
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 6px 0 rgba(0,0,0,.045);
+    border: 1px solid transparent;
+    >.portlet-with-title{
+      margin-bottom: 12px;
+      height: calc(100% - 64px);
+    }
+    >.portlet-without-title{
+      margin-top: 12px;
+      margin-bottom: 12px;
+      height: calc(100% - 24px);
+    }
+  }
+}
+
+// 看板视图，无缝模式
+.view-container.appportalview.seamless-mode,.view-container.deportalview.seamless-mode,.view-container.deportalview9.seamless-mode{
+  >.view-card>.ivu-card-body>.content-container{
+    background: transparent;
+  }
+  .portlet-container{
+    background: transparent;
+  }
+  .portlet{
+    background: transparent;
+  }
+}
+
 @import './user.less';
\ No newline at end of file

app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue

@@ -1321,8 +1321,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1348,8 +1348,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1375,8 +1375,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1409,8 +1409,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1423,8 +1423,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1473,8 +1473,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1491,8 +1491,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1561,14 +1561,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1580,8 +1582,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1620,14 +1622,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1639,8 +1643,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1692,8 +1696,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

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

@@ -752,8 +752,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
+            let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(this.removeAction,Object.assign(context,{ ibzdepartment: keys.join(';') }),Object.assign({ deptid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibzdepartment: keys.join(';') }),Object.assign({ ibzdepartment: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/ibzemployee/change-pw-form/change-pw-form-base.vue

@@ -4,8 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzemployee.changepw_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
-    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzemployee.changepw_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.oldpasswd.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='oldpasswd' :itemRules="this.rules.oldpasswd" class='' :caption="$t('entities.ibzemployee.changepw_form.details.oldpasswd')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.oldpasswd.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -1053,8 +1052,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1080,8 +1079,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1107,8 +1106,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1141,8 +1140,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1155,8 +1154,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1205,8 +1204,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1223,8 +1222,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1293,14 +1292,16 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1312,8 +1313,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1352,14 +1353,16 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1371,8 +1374,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1424,8 +1427,8 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

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

@@ -782,8 +782,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
+            let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(this.removeAction,Object.assign(context,{ ibzemployee: keys.join(';') }),Object.assign({ userid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibzemployee: keys.join(';') }),Object.assign({ ibzemployee: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/ibzorganization/main-form/main-form-base.vue

@@ -1224,8 +1224,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1251,8 +1251,8 @@ export default class MainBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1278,8 +1278,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1312,8 +1312,8 @@ export default class MainBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1326,8 +1326,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1376,8 +1376,8 @@ export default class MainBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1394,8 +1394,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1464,14 +1464,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1483,8 +1485,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1523,14 +1525,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1542,8 +1546,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1595,8 +1599,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

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

@@ -738,8 +738,9 @@ export default class MainBase extends Vue implements ControlInterface {
             _datas.forEach((data: any) => {
                 keys.push(data.srfkey);
             });
+            let _removeAction = keys.length > 1 ? 'removeBatch' : this.removeAction ;
             const context:any = JSON.parse(JSON.stringify(this.context));
-            const post: Promise<any> = this.service.delete(this.removeAction,Object.assign(context,{ ibzorganization: keys.join(';') }),Object.assign({ orgid: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
+            const post: Promise<any> = this.service.delete(_removeAction,Object.assign(context,{ ibzorganization: keys.join(';') }),Object.assign({ ibzorganization: keys.join(';') },{viewparams:this.viewparams}), this.showBusyIndicator);
             return new Promise((resolve: any, reject: any) => {
                 post.then((response: any) => {
                     if (!response || response.status !== 200) {

app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue

@@ -4,8 +4,7 @@
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzorganization.newform_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
-    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzorganization.newform_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
         <i-col v-show="detailsModel.orgcode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.newform_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -1178,8 +1177,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 });
             }
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1205,8 +1204,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
         let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1232,8 +1231,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 }
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status  && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1266,8 +1265,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
         const post: Promise<any> = this.service.add(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (!response.status || response.status !== 200) {
-                if (response.errorMessage) {
-                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                if (response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                 }
                 return;
             }
@@ -1280,8 +1279,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1330,8 +1329,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {
-                    if (response.errorMessage) {
-                        this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                    if (response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                     }
                     return;
                 }
@@ -1348,8 +1347,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 }
                 resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status  && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1418,14 +1417,16 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfstart(_this.WFStartAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流启动失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流启动成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1437,8 +1438,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1477,14 +1478,16 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 const result: Promise<any> = this.service.wfsubmit(_this.WFSubmitAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,localdata);
                 result.then((response: any) => {
                     if (!response || response.status !== 200) {
-                        this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.info });
+                        if(response.data){
+                            this.$Notice.error({ title: '', desc: '工作流提交失败, ' + response.data.message });
+                        }
                         return;
                     }
                     this.$Notice.info({ title: '', desc: '工作流提交成功' });
                     resolve(response);
             }).catch((response: any) => {
-                if (response && response.status) {
-                    this.$Notice.error({ title: '错误', desc: response.message });
+                if (response && response.status && response.data) {
+                    this.$Notice.error({ title: '错误', desc: response.data.message });
                     reject(response);
                     return;
                 }
@@ -1496,8 +1499,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 reject(response);
             });
             }).catch((response: any) => {
-                    if (response && response.status) {
-                        this.$Notice.error({ title: '错误', desc: response.message });
+                    if (response && response.status && response.data) {
+                        this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
                         return;
                     }
@@ -1549,8 +1552,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });
         }).catch((response: any) => {
-            if (response && response.status) {
-                this.$Notice.error({ title: '错误', desc: response.message });
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: '错误', desc: response.data.message });
                 return;
             }
             if (!response || !response.status || !response.data) {

config.xml

@@ -38,11 +38,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
-      mvn clean package -Papi
-      cd ibzou-provider/ibzou-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzou-app/ibzou-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30001
 
 ADD ibzou-app-web.jar /ibzou-app-web.jar

ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30001:30001"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 30001
\ No newline at end of file

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30001
 
 #zuul网关路由设置
 zuul:

ibzou-boot/src/main/resources/application-dev.yml

 server:
-  port: 40001
+  port: 8080
 

ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
 
-EXPOSE 40001
+EXPOSE 8081
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40001
+  port: 8081
\ No newline at end of file

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40001
+  port: 8081

ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
     private String systemId;
 
     @Override