ibiz4j 发布系统代码

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

@@ -82,6 +82,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue

@@ -47,6 +47,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="true"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction="Update"
                 removeAction="Remove"

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

@@ -89,6 +89,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

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

@@ -85,6 +85,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

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

@@ -78,6 +78,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

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

@@ -78,6 +78,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view-base.vue

@@ -47,6 +47,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="true"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction="Update"
                 removeAction="Remove"

app_web/src/styles/default.less

@@ -120,7 +120,7 @@
         > .ivu-card-body {
             // height: 50%;
             // flex-grow: 1;
-            height: calc(100% - 62px);
+            height: calc(100% - 74px);
             padding: 0px;
             > .content-container {
                 height: 100%;

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

@@ -479,11 +479,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -491,15 +492,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -522,6 +527,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -738,7 +750,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -782,7 +793,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

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

@@ -440,6 +440,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1697,7 +1705,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

@@ -476,6 +476,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1699,7 +1707,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

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

@@ -435,11 +435,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -447,15 +448,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -478,6 +483,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -694,7 +706,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -738,7 +749,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

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

@@ -392,6 +392,14 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1633,7 +1641,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

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

@@ -449,11 +449,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -461,15 +462,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -492,6 +497,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -708,7 +720,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -752,7 +763,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

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

@@ -392,6 +392,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1617,7 +1625,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

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

@@ -327,11 +327,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -339,15 +340,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -370,6 +375,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -586,7 +598,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -630,7 +641,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

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

@@ -308,6 +308,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1477,7 +1485,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue

@@ -408,6 +408,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1605,7 +1613,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

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

@@ -327,11 +327,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -339,15 +340,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -370,6 +375,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -586,7 +598,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -630,7 +641,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

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

@@ -296,6 +296,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     @Prop() public opendata: any;
+    
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
 
     /**
      * 显示处理提示
@@ -1457,7 +1465,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{