ibiz4j 部署微服务应用

app_web/src/components/app-wf-approval/app-wf-approval.less

 .app-wf-approval{
-    width:400px;
+    width:100%;
     .app-wf-approval-header{
         width: 100%;
         text-align: center;
-        background: #9acdf5;
+        background: #e5eaef;
         height: 32px;
         line-height: 32px;
         font-size: 16px;
@@ -15,7 +15,7 @@
     .app-wf-approval-bottom{
         width: 100%;
         text-align: center;
-        background: #9acdf5;
+        background: #e5eaef;
         height: 32px;
         line-height: 32px;
         font-size: 16px;
@@ -32,11 +32,12 @@
             font-size: 16px;
             border-bottom: 1px solid #565656;
             .approval-content-item-left{
-                width: 30%;
+                width: 130px;
                 padding: 8px;
+                text-align: center;
             }
             .approval-content-item-right{
-                width: 70%;
+                width: calc(100% - 130px);
                 border-left:1px solid #565656;
                 .approval-content-item-wait{
                     padding: 0px 4px;
@@ -79,7 +80,6 @@
                     }
                 }
                 .approval-content-item-memo{
-                    border-top:1px solid #565656;
                     padding: 0px 4px;
                     .el-textarea__inner{
                         border: 0px !important;

app_web/src/components/app-wf-approval/app-wf-approval.vue

@@ -4,7 +4,7 @@
             <span class="approval-header-left">{{data.startTime}}</span>
             <span>{{data.startUserName}}提交</span>
         </div>
-        <div class="app-wf-approval-content" v-if="data.usertasks.length >0">
+        <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
             <div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index">
                 <div class="approval-content-item-left">
                     {{usertask.userTaskName}}
@@ -24,8 +24,8 @@
                             </div>
                         </div>
                     </div>
-                    <div class="approval-content-item-memo" v-if="usertask.userTaskId === 'tid-2-c60d498abacb47b510e0aa9d64a55e57'">
-                        <el-input type="textarea"  :rows="2" v-model="input" placeholder="请输入内容"></el-input>
+                    <div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
+                        <el-input type="textarea"  v-model="initmemo" :rows="2" @blur="handleBlur" placeholder="请输入内容"></el-input>
                     </div>
                 </div>
             </div>
@@ -36,80 +36,77 @@
     </div>
 </template>
 <script lang = 'ts'>
-import { Vue, Component } from 'vue-property-decorator';
+import { Vue, Component,Prop,Model } from 'vue-property-decorator';
 
 @Component({
 })
 export default class AppWFApproval extends Vue {
 
-    public input:any ="";
+    /**
+     * 双向绑定值
+     * 
+     *  @memberof AppWFApproval
+     */
+    @Model ('change')  value!: string;
+
+    /**
+     * 数据
+     * 
+     *  @memberof AppWFApproval
+     */
+    public data:any = {};
 
     /**
-     * 传入数据
+     *  初始化memo
      * 
      *  @memberof AppWFApproval
      */
-    public data:any = {
-    "id": "40833204-9be4-11ea-9c94-0242130d84ce",
-    "name": null,
-    "processDefinitionKey": null,
-    "processDefinitionName": null,
-    "businessKey": "DC20200522022",
-    "startTime": "2020-05-22 12:25:22",
-    "endTime": null,
-    "startUserId": "001-004_0001",
-    "startUserName": "隆俊杰",
-    "usertasks": [{
-        "userTaskId": "tid-1-1f3eda90105907e25e6f2e8c0f82b903",
-        "userTaskName": "管理员审批",
-        "processDefinitionKey": null,
-        "processDefinitionName": null,
-        "identitylinks": [],
-        "comments": [{
-            "id": "44eddf40-9be4-11ea-9c94-0242130d84ce",
-            "author": "001-004_0001",
-            "authorName": "隆俊杰",
-            "fullMessage": "",
-            "time": "2020-05-22 12:25:29",
-            "type": "审批不通过",
-            "taskId": "40844383-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceId": "40833204-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceBusinessKey": "DC20200522022"
-        }, {
-            "id": "b39cfc68-9be4-11ea-9c94-0242130d84ce",
-            "author": "450000-000",
-            "authorName": "ibzadmin",
-            "fullMessage": "",
-            "time": "2020-05-22 12:28:35",
-            "type": "审批不通过",
-            "taskId": "a6c57ad1-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceId": "40833204-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceBusinessKey": "DC20200522022"
-        }]
-    }, {
-        "userTaskId": "tid-2-c60d498abacb47b510e0aa9d64a55e57",
-        "userTaskName": "被驳回",
-        "processDefinitionKey": null,
-        "processDefinitionName": null,
-        "identitylinks": [{
-            "id": "001-004_0001",
-            "firstname": null,
-            "displayname": "隆俊杰"
-        }],
-        "comments": [{
-            "id": "a6c21f6e-9be4-11ea-9c94-0242130d84ce",
-            "author": "001-004_0001",
-            "authorName": "隆俊杰",
-            "fullMessage": "",
-            "time": "2020-05-22 12:28:14",
-            "type": "提交",
-            "taskId": "44f09e63-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceId": "40833204-9be4-11ea-9c94-0242130d84ce",
-            "processInstanceBusinessKey": "DC20200522022"
-        }]
-    }]
-    };
+    public initmemo:string = "";
 
+    /**
+     * 传入数据服务
+     * 
+     *  @memberof AppWFApproval
+     */
+    @Prop() public service:any;
+
+    /**
+     *  上下文
+     * 
+     *  @memberof AppWFApproval
+     */
+    @Prop() public context:any;
+
+    /**
+     *  视图参数
+     * 
+     *  @memberof AppWFApproval
+     */
+    @Prop() public viewparams:any;
+
+    /**
+     * 初始化数据
+     * 
+     *  @memberof AppWFApproval
+     */
+    public created(){
+        if(this.service){
+            this.service.GetWFHistory(this.context).then((res:any) =>{
+                if(res && (res.status === 200)){
+                    this.data = res.data;
+                }
+            })
+        }
+    }
+
+    /**
+     * 抛出wfprocmemo
+     * 
+     *  @memberof AppWFApproval
+     */
+    public handleBlur($event:any){
+         this.$emit('change',$event.target.value);
+    }
    
 }
 </script>

app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts

@@ -94,6 +94,7 @@ export default {
 			orgname: "单位", 
 			mdeptid: "主部门", 
 			mdeptname: "部门", 
+			bcode: "业务编码", 
 			nickname: "昵称别名", 
 			sex: "性别", 
 			birthday: "出生日期", 

app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts

@@ -93,6 +93,7 @@ export default {
 			orgname: '单位', 
 			mdeptid: '主部门', 
 			mdeptname: '部门', 
+			bcode: '业务编码', 
 			nickname: '昵称别名', 
 			sex: '性别', 
 			birthday: '出生日期', 

app_web/src/service/entity-service.ts

@@ -775,7 +775,7 @@ export default class EntityService {
      * @memberof EntityService
      */
     public async GetWFHistory(context: any = {},data: any = {}, isloading?: boolean):Promise<any> {
-        return Http.getInstance().get(`/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${context[this.APPLYDEKEY]}/process-instances/alls/history`);
+        return Http.getInstance().get(`/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/${context[this.APPLYDEKEY]}/process-instances/alls/history`);
     }
 
     /**

app_web/src/store/modules/view-action/state.ts

@@ -33,8 +33,6 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'c9aa00ee38b42ea5ba1d2deb5959ac2b',
-                '9e25d15d43ff644fa008c9cf7d063ac3',
-                'b59db4df07430a34645566a64d59244c',
             ],
         },
         {

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

@@ -17,7 +17,7 @@
 </i-col>
 <i-col v-show="detailsModel.pdeptname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pdeptname' :itemRules="this.rules.pdeptname" class='' :caption="$t('entities.ibzdepartment.main_form.details.pdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{id:'pdeptid','label':'pdeptname'}" filter="srforgid" :multiple="false"  style="" @select-change="onFormItemValueChange"></app-department-select>
+    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{id:'pdeptid','label':'pdeptname'}" filter="orgid" :multiple="false"  style="" @select-change="onFormItemValueChange"></app-department-select>
 </app-form-item>
 
 </i-col>
@@ -53,7 +53,7 @@
   valueitem="leaderid"
   :multiple="true"
   filter="orgid"
-  :fillmap='{shortname: "mdeptname"}'
+  :fillmap='{'id':'leaderid','label':'leadername'}'
   :disabled="detailsModel.leadername.disabled"
   :data="data"
   :context="context"
@@ -216,6 +216,12 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof Main
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1665,6 +1671,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -206,6 +206,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof NewForm
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1504,6 +1510,10 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -194,6 +194,12 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof Main
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1404,6 +1410,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -162,6 +162,12 @@ export default class ChangePwBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof ChangePw
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1372,6 +1378,10 @@ export default class ChangePwBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -29,51 +29,13 @@
     <row>
         <i-col v-show="detailsModel.orgname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.ibzemployee.main_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :itemParam='{ }' 
-  :disabled="detailsModel.orgname.disabled"
-  name='orgname'
-  deMajorField='orgname'
-  deKeyField='ibzorganization'
-  :service="service"
-  :acParams="{ serviceName: 'IBZOrganizationService', interfaceName: 'FetchDefault'}"
-  valueitem='orgid' 
-  :value="data.orgname" 
-  editortype="" 
-  :pickupView="{ viewname: 'ibzorganization-pickup-view', title: $t('entities.ibzorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{id:'orgid','label':'orgname','code':'orgcode'}" filter="" :multiple="" style="" @select-change="onFormItemValueChange"></app-org-select>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.mdeptname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='mdeptname' :itemRules="this.rules.mdeptname" class='' :caption="$t('entities.ibzemployee.main_form.details.mdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :itemParam='{ parentdata:{"orgid":"%orgid%"}, }' 
-  :disabled="detailsModel.mdeptname.disabled"
-  name='mdeptname'
-  deMajorField='deptname'
-  deKeyField='ibzdepartment'
-  :service="service"
-  :acParams="{ serviceName: 'IBZDepartmentService', interfaceName: 'FetchDefault'}"
-  valueitem='mdeptid' 
-  :value="data.mdeptname" 
-  editortype="" 
-  :pickupView="{ viewname: 'ibzdepartment-pickup-view', title: $t('entities.ibzdepartment.views.pickupview.title'), deResParameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, ], parameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{id:'mdeptid','label':'mdeptname','code':'mdeptcode','bcode':'bcode'}" filter="orgid"   style="" @select-change="onFormItemValueChange"></app-department-select>
 </app-form-item>
 
 </i-col>
@@ -81,6 +43,12 @@
     </row>
 </app-form-group>
 
+</i-col>
+<i-col v-show="detailsModel.bcode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='bcode' :itemRules="this.rules.bcode" class='' :caption="$t('entities.ibzemployee.main_form.details.bcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bcode.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.bcode"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.bcode.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.nickname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='nickname' :itemRules="this.rules.nickname" class='' :caption="$t('entities.ibzemployee.main_form.details.nickname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.nickname.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -348,6 +316,12 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof Main
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -522,6 +496,7 @@ export default class MainBase extends Vue implements ControlInterface {
         orgname: null,
         mdeptid: null,
         mdeptname: null,
+        bcode: null,
         nickname: null,
         sex: null,
         birthday: null,
@@ -671,6 +646,12 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: true, type: 'string', message: '部门 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '部门 值不能为空', trigger: 'blur' },
         ],
+        bcode: [
+            { type: 'string', message: '业务编码 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '业务编码 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '业务编码 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '业务编码 值不能为空', trigger: 'blur' },
+        ],
         nickname: [
             { type: 'string', message: '昵称别名 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '昵称别名 值必须为字符串类型', trigger: 'blur' },
@@ -821,6 +802,8 @@ export default class MainBase extends Vue implements ControlInterface {
         mdeptid: new FormItemModel({ caption: '主部门', detailType: 'FORMITEM', name: 'mdeptid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         mdeptname: new FormItemModel({ caption: '部门', detailType: 'FORMITEM', name: 'mdeptname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        bcode: new FormItemModel({ caption: '业务编码', detailType: 'FORMITEM', name: 'bcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         nickname: new FormItemModel({ caption: '昵称别名', detailType: 'FORMITEM', name: 'nickname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -1038,6 +1021,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'mdeptname', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 bcode 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main
+     */
+    @Watch('data.bcode')
+    onBcodeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'bcode', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 nickname 值
      *
@@ -1313,6 +1308,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }
@@ -2007,6 +2003,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

app_web/src/widgets/ibzemployee/main-form/main-form-model.ts

@@ -90,6 +90,11 @@ export default class MainModel {
         prop: 'mdeptname',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'bcode',
+        prop: 'bcode',
+        dataType: 'TEXT',
+      },
       {
         name: 'nickname',
         prop: 'nickname',

app_web/src/widgets/ibzemployee/main-form/main-form-service.ts

@@ -2,8 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBZEmployeeService from '@/service/ibzemployee/ibzemployee-service';
 import MainModel from './main-form-model';
-import IBZOrganizationService from '@/service/ibzorganization/ibzorganization-service';
-import IBZDepartmentService from '@/service/ibzdepartment/ibzdepartment-service';
 
 
 /**
@@ -43,22 +41,6 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
-    /**
-     * 单位机构服务对象
-     *
-     * @type {IBZOrganizationService}
-     * @memberof MainService
-     */
-    public ibzorganizationService: IBZOrganizationService = new IBZOrganizationService();
-
-    /**
-     * 部门服务对象
-     *
-     * @type {IBZDepartmentService}
-     * @memberof MainService
-     */
-    public ibzdepartmentService: IBZDepartmentService = new IBZDepartmentService();
-
     /**
      * 处理数据
      *
@@ -98,12 +80,6 @@ export default class MainService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'IBZOrganizationService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.ibzorganizationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'orgid', 'ibzorganization');
-        }
-        if (Object.is(serviceName, 'IBZDepartmentService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.ibzdepartmentService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'deptid', 'ibzdepartment');
-        }
 
         return Promise.reject([])
     }

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

@@ -212,6 +212,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof NewForm
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1532,6 +1538,10 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -205,6 +205,12 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof Main
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1544,6 +1550,10 @@ export default class MainBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

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

@@ -181,6 +181,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
     }
 
 
+    /**
+     * 工作流审批意见控件绑定值
+     *
+     * @memberof NewForm
+     */
+    public srfwfmemo:string = "";
     
     /**
      * 获取多项数据
@@ -1435,6 +1441,10 @@ export default class NewFormBase extends Vue implements ControlInterface {
                 if(this.viewparams){
                     Object.assign(arg,{viewparams:this.viewparams});
                 }
+                // 强制补充srfwfmemo
+                if(this.srfwfmemo){
+                    Object.assign(arg,{srfwfmemo:this.srfwfmemo});
+                }
                 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) {

config.xml

@@ -37,11 +37,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,21 @@ 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
+      - SERVER_PORT=30001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzou-core/src/main/resources/liquibase/h2_table.xml

@@ -32,7 +32,7 @@
 
 
     <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-623-2">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-626-2">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
@@ -126,7 +126,7 @@
 
 
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-605-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-607-4">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -165,10 +165,10 @@
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZEMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-623-6">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-626-6">
        <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-623-7">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-626-7">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPTMEMBER]外键关系 -->
@@ -179,10 +179,10 @@
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-605-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-607-10">
        <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-605-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-607-11">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
 

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,21 +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
-      - SERVER_PORT=40001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1