适配表单数据对象方式新建、更新默认值 --- fix2

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

@@ -1711,8 +1711,8 @@ import { Environment } from '@/environments/environment';
     public createDefault(){                    
 <#list ctrl.getAllPSDEFormDetails() as formdetail><#t>
   <#if formdetail.getCreateDV?? && formdetail.getCreateDV()??><#t>
-    <#if !(formdetail.getCreateDV() == '') || formdetail.getCreateDVT() == 'CURTIME'><#t>
         if (this.data.hasOwnProperty('${formdetail.getCodeName()?lower_case}')) {
+    <#if !(formdetail.getCreateDVT() == '')><#t>
       <#-- 网页请求 -->
       <#if formdetail.getCreateDVT() == 'CONTEXT'>
             this.data['${formdetail.getCodeName()?lower_case}'] = this.viewparams['${formdetail.getCreateDV()}'];
@@ -1734,13 +1734,13 @@ import { Environment } from '@/environments/environment';
       <#-- 数据对象属性 -->
       <#elseif formdetail.getCreateDVT() == 'PARAM'>
           this.data['${formdetail.getCodeName()?lower_case}'] = this.service?.getRemoteCopyData()?.${formdetail.getCreateDV()};
-      <#else>
+      </#if>
+    <#else>
       <#-- 默认值 -->
             <#assign datatype=srfjavatype(formdetail.getStdDataType())>
             this.data['${formdetail.getCodeName()?lower_case}'] = <#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>${formdetail.getCreateDV()}<#else>'${formdetail.getCreateDV()}'</#if>;
-      </#if>
-        }
     </#if>
+        }
   </#if>
 </#list>
     }
@@ -1752,8 +1752,8 @@ import { Environment } from '@/environments/environment';
     public updateDefault(){                    
         <#list ctrl.getAllPSDEFormDetails() as formdetail><#t>
         <#if formdetail.getUpdateDV?? && formdetail.getUpdateDV()??><#t>
-        <#if !(formdetail.getUpdateDVT() == '')><#t>
         if (this.data.hasOwnProperty('${formdetail.getCodeName()?lower_case}') && !this.data.${formdetail.getCodeName()?lower_case}) {
+        <#if !(formdetail.getUpdateDVT() == '')><#t>
         <#-- 网页请求 -->
         <#if formdetail.getUpdateDVT() == 'CONTEXT'>
             this.data['${formdetail.getCodeName()?lower_case}'] = this.viewparams['${formdetail.getUpdateDV()}'];
@@ -1772,6 +1772,7 @@ import { Environment } from '@/environments/environment';
         <#-- 数据对象属性 -->
          <#elseif formdetail.getUpdateDVT() == 'PARAM'>
             this.data['${formdetail.getCodeName()?lower_case}'] = this.service?.getRemoteCopyData()?.${formdetail.getUpdateDV()};
+        </#if>
         <#else>
         <#-- 默认值 -->
             <#assign datatype=srfjavatype(formdetail.getStdDataType())>
@@ -1779,7 +1780,6 @@ import { Environment } from '@/environments/environment';
         </#if>
         }
         </#if>
-        </#if>
         </#list>
     }