chenjun пре 1 година
родитељ
комит
dda1348d66

+ 5 - 5
zjugis-business/src/main/resources/templates/AttendanceNote/index.ftl

@@ -1,5 +1,5 @@
-<@w.workFlow javascripts=['/AttendanceNote/js/index.js','/js/moment.js']
-styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
+<@w.workFlow javascripts=['/AttendanceNote/js/index.js','/js/moment.js', '/OwCommon/OwCommon.js']
+styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
     <div class="z-position form-boss ow-tabs" name="createReqVO">
         <div class="z-form-row" style="display: none;">
             <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
@@ -13,7 +13,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
             </#if>
         </ul>
         <div class="ow-tab-scroll">
-            <div class="ow-tab-content" name="jbxx">
+            <div class="ow-tab-content on" name="jbxx">
                 <div class="form-title" style="margin-top: 0px;">
                     <div class="form-icon">
                         <img src="/imgs/titleIcon.png" alt="">
@@ -117,8 +117,8 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </table>
                 </div>
             </div>
+            <#if WORKFLOW.OPINION! !="">
             <div class="ow-tab-content" name="yj">
-                <#if WORKFLOW.OPINION! !="">
                     <div class="form-title">
                         <div class="form-icon">
                             <img src="/imgs/titleIcon.png" alt="">
@@ -132,8 +132,8 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
                         </div>
                     </div>
-                </#if>
             </div>
+            </#if>
         </div>
 
     </div>

+ 4 - 4
zjugis-business/src/main/resources/templates/CommonCost/agentIndex.ftl

@@ -1,4 +1,4 @@
-<@w.workFlow javascripts=['/CommonCost/js/agentIndex.js','/CommonCost/js/money.js','/flow/js/formCommon.js','/js/moment.js']
+<@w.workFlow javascripts=['/CommonCost/js/agentIndex.js','/CommonCost/js/money.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
   styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
   <div class="z-position form-boss ow-tabs" name="createReqVO">
     <div class="z-form-row" style="display: none;">
@@ -17,7 +17,7 @@
       </#if>
     </ul>
     <div class="ow-tab-scroll">
-      <div class="ow-tab-content" name="jbxx">
+      <div class="ow-tab-content on" name="jbxx">
         <div class="form-title" style="margin-top: 0px;">
           <div class="form-icon">
             <img src="/imgs/titleIcon.png" alt="">
@@ -212,8 +212,8 @@
           </table>
         </div>
       </div>
+      <#if WORKFLOW.OPINION! !="">
       <div class="ow-tab-content" name="yj">
-        <#if WORKFLOW.OPINION! !="">
           <div class="form-title">
             <div class="form-icon">
               <img src="/imgs/titleIcon.png" alt="">
@@ -227,8 +227,8 @@
               <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
             </div>
           </div>
-        </#if>
       </div>
+      </#if>
     </div>
   </div>
   <script language="javascript" src="/timeSelector/TimeSelector.js"></script>

+ 4 - 4
zjugis-business/src/main/resources/templates/CommonCost/index.ftl

@@ -1,4 +1,4 @@
-<@w.workFlow javascripts=['/CommonCost/js/index.js','/CommonCost/js/money.js','/flow/js/formCommon.js','/js/moment.js']
+<@w.workFlow javascripts=['/CommonCost/js/index.js','/CommonCost/js/money.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
   styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
   <div class="z-position form-boss ow-tabs" name="createReqVO">
     <div class="z-form-row" style="display: none;">
@@ -16,7 +16,7 @@
       </#if>
     </ul>
     <div class="ow-tab-scroll">
-      <div class="ow-tab-content" name="jbxx">
+      <div class="ow-tab-content on" name="jbxx">
         <div class="form-title" style="margin-top: 0px;">
           <div class="form-icon">
             <img src="/imgs/titleIcon.png" alt="">
@@ -195,8 +195,8 @@
           </table>
         </div>
       </div>
+      <#if WORKFLOW.OPINION! !="">
       <div class="ow-tab-content" name="yj">
-        <#if WORKFLOW.OPINION! !="">
           <div class="form-title">
             <div class="form-icon">
               <img src="/imgs/titleIcon.png" alt="">
@@ -210,8 +210,8 @@
               <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
             </div>
           </div>
-        </#if>
       </div>
+      </#if>
     </div>
   </div>
   <script language="javascript" src="/timeSelector/TimeSelector.js"></script>

+ 5 - 5
zjugis-business/src/main/resources/templates/Leave/index.ftl

@@ -1,5 +1,5 @@
-<@w.workFlow javascripts=['/Leave/js/index.js','/js/moment.js','/Leave/js/leaveTimeAuth.js']
-styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
+<@w.workFlow javascripts=['/Leave/js/index.js','/js/moment.js','/Leave/js/leaveTimeAuth.js', '/OwCommon/OwCommon.js']
+styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
     <div class="z-position form-boss ow-tabs" name="createReqVO">
         <div class="z-form-row" style="display: none;">
             <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
@@ -14,7 +14,7 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
             </#if>
         </ul>
         <div class="ow-tab-scroll">
-            <div class="ow-tab-content" name="jbxx">
+            <div class="ow-tab-content on" name="jbxx">
                 <div class="form-title" style="margin-top: 0px;">
                     <div class="form-icon">
                         <img src="/imgs/titleIcon.png" alt="">
@@ -164,8 +164,8 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                     </table>
                 </div>
             </div>
+            <#if WORKFLOW.OPINION! !="">
             <div class="ow-tab-content" name="yj">
-                <#if WORKFLOW.OPINION! !="">
                     <div class="form-title">
                         <div class="form-icon">
                             <img src="/imgs/titleIcon.png" alt="">
@@ -179,8 +179,8 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
                             <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
                         </div>
                     </div>
-                </#if>
             </div>
+            </#if>
         </div>
 
     </div>

+ 5 - 5
zjugis-business/src/main/resources/templates/Travel/index.ftl

@@ -1,5 +1,5 @@
-<@w.workFlow javascripts=['/Travel/js/index.js','/flow/js/formCommon.js','/js/moment.js']
-  styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
+<@w.workFlow javascripts=['/Travel/js/index.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
+  styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
   <div class="z-position form-boss" name="createReqVO">
     <div class="z-form-row" style="display: none;">
       <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
@@ -13,7 +13,7 @@
       </#if>
     </ul>
     <div class="ow-tab-scroll">
-      <div class="ow-tab-content" name="jbxx">
+      <div class="ow-tab-content on" name="jbxx">
         <div class="form-title" style="margin-top: 0px;">
           <div class="form-icon">
             <img src="/imgs/titleIcon.png" alt="">
@@ -165,8 +165,8 @@
           </table>
         </div>
       </div>
+      <#if WORKFLOW.OPINION! !="">
       <div class="ow-tab-content" name="yj">
-        <#if WORKFLOW.OPINION! !="">
           <div class="form-title">
             <div class="form-icon">
               <img src="/imgs/titleIcon.png" alt="">
@@ -180,8 +180,8 @@
               <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
             </div>
           </div>
-        </#if>
       </div>
+      </#if>
     </div>
 
   </div>

+ 4 - 4
zjugis-business/src/main/resources/templates/TravelCost/index.ftl

@@ -1,4 +1,4 @@
-<@w.workFlow javascripts=['/TravelCost/js/index.js','/TravelCost/js/money.js','/flow/js/formCommon.js','/js/moment.js']
+<@w.workFlow javascripts=['/TravelCost/js/index.js','/TravelCost/js/money.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
   styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
   <div class="z-position form-boss ow-tabs" name="createReqVO">
     <div class="z-form-row" style="display: none;">
@@ -19,7 +19,7 @@
       </#if>
     </ul>
     <div class="ow-tab-scroll">
-      <div class="ow-tab-content" name="jbxx">
+      <div class="ow-tab-content on" name="jbxx">
         <div class="form-title" style="margin-top: 0px;">
           <div class="form-icon">
             <img src="/imgs/titleIcon.png" alt="">
@@ -384,8 +384,8 @@
           </table>
         </div>
       </div>
+      <#if WORKFLOW.OPINION! !="">
       <div class="ow-tab-content" name="yj">
-        <#if WORKFLOW.OPINION! !="">
           <div class="form-title">
             <div class="form-icon">
               <img src="/imgs/titleIcon.png" alt="">
@@ -399,8 +399,8 @@
               <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
             </div>
           </div>
-        </#if>
       </div>
+      </#if>
     </div>
   </div>
   <script language="javascript" src="/timeSelector/TimeSelector.js"></script>