表单提交流程逻辑调整

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -164,11 +164,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isWorkflow] 是否在工作流中添加数据
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
     @Errorlog
-    public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
         <#-- 手动修改数据主键的情况start -->
         <#list ctrl.getPSDEFormItems() as formitem>
@@ -188,8 +189,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 result = this.appEntityService.Create(Context,Data, isloading);
             }
             result.then((response) => {
-                this.handleResponse(action, response);
-                resolve(response);
+                if(isWorkflow){
+                    resolve(response);
+                }else{
+                    this.handleResponse(action, response);
+                    resolve(response);
+                }
             }).catch(response => {
                 reject(response);
             });
@@ -232,11 +237,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      * @param {*} [context={}]
      * @param {*} [data={}]
      * @param {boolean} [isloading]
+     * @param {boolean} [isWorkflow] 是否在工作流中修改数据
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
     @Errorlog
-    public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+    public update(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
@@ -247,8 +253,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 result = this.appEntityService.Update(Context,Data, isloading);
             }
             result.then((response) => {
-                this.handleResponse(action, response);
-                resolve(response);
+                if(isWorkflow){
+                    resolve(response);
+                }else{
+                    this.handleResponse(action, response);
+                    resolve(response);
+                }
             }).catch(response => {
                 reject(response);
             });

@CONTROL/表单/CONTROL-BASE.vue.ftl

@@ -1387,13 +1387,17 @@ import schema from 'async-validator';
         return new Promise((resolve: any, reject: any) => {
         const _this: any = this;
         const arg: any = data[0];
+        const copyData:any = Util.deepCopy(arg);
         Object.assign(arg,{viewparams:this.viewparams});
         if (!arg.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} || Object.is(arg.${ctrl.getPSAppDataEntity().getCodeName()?lower_case}, '')) {
             return;
         }
-        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
+        const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,true):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator,true);
         post.then((response:any) =>{
-                const arg:any = response.data;
+                const responseData:any = response.data;
+                let tempResponseData:any = Util.deepCopy(response);
+                this.service.handleResponse('save', tempResponseData);
+                const arg:any = tempResponseData.data;
                 // 保存完成UI处理
                 this.onFormLoad(arg,'save');
                 this.$emit('save', arg);
@@ -1404,11 +1408,12 @@ import schema from 'async-validator';
                     this.formState.next({ type: 'save', data: arg });
                 });
                 // 准备工作流数据,填充未存库数据
-                Object.assign(arg,this.getData());
+                Object.assign(arg,copyData);
                 // 准备提交参数
                 if(this.viewparams){
-                    Object.assign(arg,{viewparams:this.viewparams});
+                    Object.assign(responseData,this.viewparams);
                 }
+                Object.assign(arg,{viewparams:responseData});
                 // 强制补充srfwfmemo
                 if(this.srfwfmemo){
                     Object.assign(arg,{srfwfmemo:this.srfwfmemo});