Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/resources/static/flow/css/formCommon.css

@@ -123,6 +123,7 @@
 .z-comp-date{
   background-color: #fff;
 }
+.form-title .form-btn button,
 .form-title .form-btn div {
   display: flex;
   align-items: center;
@@ -132,8 +133,20 @@
   padding: 0 10px;
   border: 1px solid #2e77e6;
   cursor: pointer;
+  background: none;
 }
 
+.form-title .form-btn button[disabled]{
+  border-color: #cbd1d6;
+}
+.form-title .form-btn button[disabled] span {
+  color: #cbd1d6;
+}
+.form-title .form-btn button[disabled] img {
+  filter: grayscale(100%);
+  opacity: 40%;
+}
+.form-title .form-btn button span,
 .form-title .form-btn div span {
   font-size: 16px;
   color: #2e77e6;
@@ -142,7 +155,24 @@
 .form-title img {
   margin-right: 10px;
 }
-
+.form-table-disable .z-comp-input,
+.form-table-disable .z-comp-inputsearch,
+.form-table-disable .z-comp-inputselect,
+.form-table-disable .z-comp-select,
+.form-table-disable .z-comp-selectsearch,
+.form-table-disable .z-comp-selecttree,
+.form-table-disable .z-comp-textarea,
+.form-table-disable .z-selecttree,
+.form-table-disable .z-comp-input,
+.form-table-disable .z-comp-date,
+.form-table-disable input {
+  border: 0px;
+  background: none !important;
+}
+.form-table-disable .z-inputselect-bar i,
+.form-table-disable .z-select-closebtn {
+  display: none;
+}
 .jbxx-box {
   background-color: #f7f8fb;
   padding: 20px 60px;

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

@@ -1,113 +1,141 @@
 <@w.workFlow javascripts=['/AttendanceNote/js/index.js','/js/moment.js']
 styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
-    <div class="z-position form-boss" name="createReqVO">
+    <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">
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
             <input type="text" value='${timeObject!}' id="timeObject">
         </div>
-        <div class="form-title" style="margin-top: 0px;">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>基本信息</span>
-            </div>
-            <div class="form-btn">
-            </div>
-        </div>
-        <div class="jbxx-box jbxx-box-flex">
-            <table class="jbxx-table-info">
-                <tr>
-                    <td class='th'>
-                        <div class="form-label">说明人：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$userNickname">
-                                    <input type="text" value="${formEntity.userNickname!}">
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content" name="jbxx">
+                <div class="form-title" style="margin-top: 0px;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>基本信息</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class='th'>
+                                <div class="form-label">说明人：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$userNickname">
+                                            <input type="text" value="${formEntity.userNickname!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class='th'>
-                        <div class="form-label">所在部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$deptName">
-                                    <input type="text" value="${formEntity.deptName!}">
+                            </td>
+                            <td class='th'>
+                                <div class="form-label">所在部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$deptName">
+                                            <input type="text" value="${formEntity.deptName!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class='th'>
-                        <div class="form-label">申请时间：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                    <input type="text" value="${(formEntity.createTime?date)!}">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class='th'>
+                                <div class="form-label">申请时间：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                                            <input type="text" value="${(formEntity.createTime?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class='th'>
-                        <div class="form-label">说明单号：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
-                                    <input type="text" value="${formEntity.attendanceNoteNo!}">
+                            </td>
+                            <td class='th'>
+                                <div class="form-label">说明单号：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
+                                            <input type="text" value="${formEntity.attendanceNoteNo!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class='th'>
-                        <div class="form-label">考勤说明：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item" style="margin: 10px 0;">
-                                <div class="z-comp-textarea" name="createReqVO$attendanceNoteReason">
-                                    <textarea>${formEntity.attendanceNoteReason!}</textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class='th'>
+                                <div class="form-label">考勤说明：</div>
+                            </td>
+                            <td colspan="3">
+                                <div class="form-group">
+                                    <div class="form-item" style="margin: 10px 0;">
+                                        <div class="z-comp-textarea" name="createReqVO$attendanceNoteReason">
+                                            <textarea>${formEntity.attendanceNoteReason!}</textarea>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>考勤说明时间信息</span>
+                    </div>
+                    <div class="form-btn">
+                        <div id="addData">
+                            <img src="/imgs/addIcon.png" alt="">
+                            <span>新增</span>
                         </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="form-title">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>考勤说明时间信息</span>
-            </div>
-            <div class="form-btn">
-                <div id="addData">
-                    <img src="/imgs/addIcon.png" alt="">
-                    <span>新增</span>
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <table class="form-table-info">
+                        <tr>
+                            <td>序号</td>
+                            <td style="width: 30%;">起始时间</td>
+                            <td style="width: 30%;">截止时间</td>
+                            <td>备注</td>
+                            <td>操作</td>
+                        </tr>
+                        <tbody class="tbody tbodyQjsq"></tbody>
+                    </table>
                 </div>
             </div>
+            <div class="ow-tab-content" name="yj">
+                <#if WORKFLOW.OPINION! !="">
+                    <div class="form-title">
+                        <div class="form-icon">
+                            <img src="/imgs/titleIcon.png" alt="">
+                            <span>审批意见</span>
+                        </div>
+                        <div class="form-btn">
+                        </div>
+                    </div>
+                    <div class="qjsjxx-box">
+                        <div class="z-form-wrap" name="opinionsDiv">
+                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                        </div>
+                    </div>
+                </#if>
+            </div>
         </div>
-        <div class="qjsjxx-box">
-            <table class="form-table-info">
-                <tr>
-                    <td>序号</td>
-                    <td style="width: 30%;">起始时间</td>
-                    <td style="width: 30%;">截止时间</td>
-                    <td>备注</td>
-                    <td>操作</td>
-                </tr>
-                <tbody class="tbody tbodyQjsq"></tbody>
-            </table>
-        </div>
+
     </div>
     <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
     <script language="javascript">

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

@@ -9,198 +9,207 @@
       <input type="text" value='${costTypeJSON!}' id="costTypeJSON">
       <input type="text" value='${detailList!}' id="detailList">
     </div>
+    <ul class="ow-tab-nav oa_tabBox">
+      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+      <#if WORKFLOW.OPINION! !="">
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+      </#if>
+    </ul>
     <div class="ow-tab-scroll">
-      <div class="form-title" style="margin-top: 0px;">
-        <div class="form-icon">
-          <img src="/imgs/titleIcon.png" alt="">
-          <span>基本信息</span>
-        </div>
-        <div class="form-btn">
+      <div class="ow-tab-content" name="jbxx">
+        <div class="form-title" style="margin-top: 0px;">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>基本信息</span>
+          </div>
+          <div class="form-btn">
+          </div>
         </div>
-      </div>
-      <div class="jbxx-box jbxx-box-flex">
-        <table class="jbxx-table-info">
-          <tr>
-            <td class="th">
-              <div class="form-label">报销人：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$userNickname">
-                    <input type="text" value="${formEntity.userNickname!}">
+        <div class="jbxx-box jbxx-box-flex">
+          <table class="jbxx-table-info">
+            <tr>
+              <td class="th">
+                <div class="form-label">报销人：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$userNickname">
+                      <input type="text" value="${formEntity.userNickname!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">所在部门：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$deptName">
-                    <input type="text" value="${formEntity.deptName!}">
+              </td>
+              <td class="th">
+                <div class="form-label">所在部门：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$deptName">
+                      <input type="text" value="${formEntity.deptName!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">申请时间：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                    <input type="text" value="${(formEntity.applyTime?date)!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">申请时间：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                      <input type="text" value="${(formEntity.applyTime?date)!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">报销单号：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$commonCostNo">
-                    <input type="text" value="${formEntity.commonCostNo!}">
+              </td>
+              <td class="th">
+                <div class="form-label">报销单号：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$commonCostNo">
+                      <input type="text" value="${formEntity.commonCostNo!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">付款单位：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="z-comp-selecttree" name="createReqVO$paymentCompany">
-                  <input type="hidden" name="createReqVO$paymentCompanyId" value="${formEntity.paymentCompanyId!}">
-                  <div class="z-inputselect-bar">
-                    <span> ${paymentCompanyName!} </span><i></i>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">付款单位：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="createReqVO$paymentCompany">
+                    <input type="hidden" name="createReqVO$paymentCompanyId" value="${formEntity.paymentCompanyId!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${paymentCompanyName!} </span><i></i>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">付款方式：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-select" name="createReqVO$paymentMethod" value="${formEntity.paymentMethod!}" data='[{"value":1,"text":"银行"},{"value":2,"text":"现金"}]
+              </td>
+              <td class="th">
+                <div class="form-label">付款方式：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-select" name="createReqVO$paymentMethod" value="${formEntity.paymentMethod!}" data='[{"value":1,"text":"银行"},{"value":2,"text":"现金"}]
   '>
-                    <div class="z-inputselect-bar">
-                      <span></span><i></i>
+                      <div class="z-inputselect-bar">
+                        <span></span><i></i>
+                      </div>
                     </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">报销总金额：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input z-readonly" name="createReqVO$totalAmount">
-                    <input type="text" value="${formEntity.totalAmount!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">报销总金额：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input z-readonly" name="createReqVO$totalAmount">
+                      <input type="text" value="${formEntity.totalAmount!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">大写单据总金额：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input z-readonly" name="createReqVO$totalAmountCn">
-                    <input type="text" value="${formEntity.totalAmountCn!}">
+              </td>
+              <td class="th">
+                <div class="form-label">大写单据总金额：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input z-readonly" name="createReqVO$totalAmountCn">
+                      <input type="text" value="${formEntity.totalAmountCn!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">是否抵用借款：</div>
-            </td>
-            <td colspan="3">
-              <div class="form-group">
-                <div class="z-comp-checkbox" name="createReqVO$dybx">
-                  <div class="z-checkbox-item <#if (formEntity.dybx!) ? contains(" 1")>checked</#if>"><i></i>抵用借款</div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">报销备注：</div>
-            </td>
-            <td colspan="3">
-              <div class="form-group">
-                <div class="form-item" style="margin: 10px 0;">
-                  <div class="z-comp-textarea" name="createReqVO$bz1">
-                    <textarea>${formEntity.bz1!}</textarea>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">是否抵用借款：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="z-comp-checkbox" name="createReqVO$dybx">
+                    <div class="z-checkbox-item <#if (formEntity.dybx!) ? contains(" 1")>checked</#if>"><i></i>抵用借款</div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <#if (glcg!0)==1>
+              </td>
+            </tr>
             <tr>
               <td class="th">
-                <div class="form-label">关联采购：</div>
+                <div class="form-label">报销备注：</div>
               </td>
               <td colspan="3">
                 <div class="form-group">
                   <div class="form-item" style="margin: 10px 0;">
-                    <div class="z-comp-textarea" style="height: 40px;">
-                      <div id="glcghtml" style="margin: 10px;cursor: pointer;"></div>
+                    <div class="z-comp-textarea" name="createReqVO$bz1">
+                      <textarea>${formEntity.bz1!}</textarea>
                     </div>
                   </div>
                 </div>
               </td>
             </tr>
-          </#if>
-        </table>
-      </div>
-      <div class="form-title">
-        <div class="form-icon">
-          <img src="/imgs/titleIcon.png" alt="">
-          <span>单据详情</span>
+          </table>
         </div>
-        <div class="form-btn">
-          <div id="addData" name="addData">
-            <img src="/imgs/addIcon.png" alt="">
-            <span>新增</span>
+        <div class="form-title">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>单据详情</span>
+          </div>
+          <div class="form-btn">
+            <div id="addData" name="addData">
+              <img src="/imgs/addIcon.png" alt="">
+              <span>新增</span>
+            </div>
           </div>
         </div>
+        <div class="qjsjxx-box">
+          <table class="form-table-info">
+            <tr style="height: 37px;">
+              <td style="width: 2%;"></td>
+              <td style="width: 20%;">项目名称</td>
+              <td style="width: 10%;">项目部门</td>
+              <td style="width: 9%;">发生日期</td>
+              <td style="width: 13%;">费用实际所属类型</td>
+              <td style="width: 10%;">发票内容</td>
+              <td style="width: 8%;">单据张数</td>
+              <td style="width: 8%;">金额</td>
+              <td style="width: 10%;">备注</td>
+              <td style="width: 10%;">操作</td>
+            </tr>
+            <tbody class="tbody tbodyQjsq">
+            </tbody>
+          </table>
+        </div>
       </div>
-      <div class="qjsjxx-box">
-        <table class="form-table-info">
-          <tr style="height: 37px;">
-            <td style="width: 2%;"></td>
-            <td style="width: 20%;">项目名称</td>
-            <td style="width: 10%;">项目部门</td>
-            <td style="width: 9%;">发生日期</td>
-            <td style="width: 13%;">费用实际所属类型</td>
-            <td style="width: 10%;">发票内容</td>
-            <td style="width: 8%;">单据张数</td>
-            <td style="width: 8%;">金额</td>
-            <td style="width: 10%;">备注</td>
-            <td style="width: 10%;">操作</td>
-          </tr>
-          <tbody class="tbody tbodyQjsq">
-          </tbody>
-        </table>
+      <div class="ow-tab-content" name="yj">
+        <#if WORKFLOW.OPINION! !="">
+          <div class="form-title">
+            <div class="form-icon">
+              <img src="/imgs/titleIcon.png" alt="">
+              <span>审批意见</span>
+            </div>
+            <div class="form-btn">
+            </div>
+          </div>
+          <div class="qjsjxx-box">
+            <div class="z-form-wrap" name="opinionsDiv">
+              <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+            </div>
+          </div>
+        </#if>
       </div>
     </div>
   </div>
@@ -208,8 +217,6 @@
   <script language="javascript">
   ;
   (function() {})();
-  window.url = '${z_work_flow}'
-  window.glcglist = '${glcglist!}'
   </script>
   <style type="text/css">
     .qjsjxx-box .form-table-info tr:nth-child(1){

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

@@ -8,182 +8,207 @@
       <input type="text" value='${costTypeJSON!}' id="costTypeJSON">
       <input type="text" value='${detailList!}' id="detailList">
     </div>
+    <ul class="ow-tab-nav oa_tabBox">
+      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+      <#if WORKFLOW.OPINION! !="">
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+      </#if>
+    </ul>
     <div class="ow-tab-scroll">
-      <div class="form-title" style="margin-top: 0px;">
-        <div class="form-icon">
-          <img src="/imgs/titleIcon.png" alt="">
-          <span>基本信息</span>
-        </div>
-        <div class="form-btn">
+      <div class="ow-tab-content" name="jbxx">
+        <div class="form-title" style="margin-top: 0px;">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>基本信息</span>
+          </div>
+          <div class="form-btn">
+          </div>
         </div>
-      </div>
-      <div class="jbxx-box jbxx-box-flex">
-        <table class="jbxx-table-info">
-          <tr>
-            <td class="th">
-              <div class="form-label">报销人：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$userNickname">
-                    <input type="text" value="${formEntity.userNickname!}">
+        <div class="jbxx-box jbxx-box-flex">
+          <table class="jbxx-table-info">
+            <tr>
+              <td class="th">
+                <div class="form-label">报销人：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$userNickname">
+                      <input type="text" value="${formEntity.userNickname!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">所在部门：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$deptName">
-                    <input type="text" value="${formEntity.deptName!}">
+              </td>
+              <td class="th">
+                <div class="form-label">所在部门：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$deptName">
+                      <input type="text" value="${formEntity.deptName!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">申请时间：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                    <input type="text" value="${(formEntity.applyTime?date)!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">申请时间：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                      <input type="text" value="${(formEntity.applyTime?date)!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">报销单号：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input" name="createReqVO$commonCostNo">
-                    <input type="text" value="${formEntity.commonCostNo!}">
+              </td>
+              <td class="th">
+                <div class="form-label">报销单号：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$commonCostNo">
+                      <input type="text" value="${formEntity.commonCostNo!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">付款单位：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="z-comp-selecttree" name="createReqVO$paymentCompany">
-                  <input type="hidden" name="createReqVO$paymentCompanyId" value="${formEntity.paymentCompanyId!}">
-                  <div class="z-inputselect-bar">
-                    <span> ${paymentCompanyName!} </span><i></i>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">付款单位：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="createReqVO$paymentCompany">
+                    <input type="hidden" name="createReqVO$paymentCompanyId" value="${formEntity.paymentCompanyId!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${paymentCompanyName!} </span><i></i>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">付款方式：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-select" name="createReqVO$paymentMethod" value="${formEntity.paymentMethod!}" data='[{"value":1,"text":"银行"},{"value":2,"text":"现金"}]
+              </td>
+              <td class="th">
+                <div class="form-label">付款方式：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-select" name="createReqVO$paymentMethod" value="${formEntity.paymentMethod!}" data='[{"value":1,"text":"银行"},{"value":2,"text":"现金"}]
   '>
-                    <div class="z-inputselect-bar">
-                      <span></span><i></i>
+                      <div class="z-inputselect-bar">
+                        <span></span><i></i>
+                      </div>
                     </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">报销总金额：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input z-readonly" name="createReqVO$totalAmount">
-                    <input type="text" value="${formEntity.totalAmount!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">报销总金额：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input z-readonly" name="createReqVO$totalAmount">
+                      <input type="text" value="${formEntity.totalAmount!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">大写单据总金额：</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-input z-readonly" name="createReqVO$totalAmountCn">
-                    <input type="text" value="${formEntity.totalAmountCn!}">
+              </td>
+              <td class="th">
+                <div class="form-label">大写单据总金额：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input z-readonly" name="createReqVO$totalAmountCn">
+                      <input type="text" value="${formEntity.totalAmountCn!}">
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">是否抵用借款：</div>
-            </td>
-            <td colspan="3">
-              <div class="form-group">
-                <div class="z-comp-checkbox" name="createReqVO$dybx">
-                  <div class="z-checkbox-item <#if (formEntity.dybx!) ? contains(" 1")>checked</#if>"><i></i>抵用借款</div>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">是否抵用借款：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="z-comp-checkbox" name="createReqVO$dybx">
+                    <div class="z-checkbox-item <#if (formEntity.dybx!) ? contains(" 1")>checked</#if>"><i></i>抵用借款</div>
+                  </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="th">
-              <div class="form-label">报销备注：</div>
-            </td>
-            <td colspan="3">
-              <div class="form-group">
-                <div class="form-item" style="margin: 10px 0;">
-                  <div class="z-comp-textarea" name="createReqVO$bz1">
-                    <textarea>${formEntity.bz1!}</textarea>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">报销备注：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" name="createReqVO$bz1">
+                      <textarea>${formEntity.bz1!}</textarea>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div class="form-title">
-        <div class="form-icon">
-          <img src="/imgs/titleIcon.png" alt="">
-          <span>单据详情</span>
+              </td>
+            </tr>
+          </table>
         </div>
-        <div class="form-btn">
-          <div id="addData" name="addData">
-            <img src="/imgs/addIcon.png" alt="">
-            <span>新增</span>
+        <div class="form-title">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>单据详情</span>
+          </div>
+          <div class="form-btn">
+            <button id="addData" name="addData">
+              <img src="/imgs/addIcon.png" alt="">
+              <span>新增</span>
+            </button>
           </div>
         </div>
+        <div class="qjsjxx-box">
+          <table class="form-table-info">
+            <tr style="height: 37px;">
+              <td style="width: 2%;"></td>
+              <td style="width: 20%;">项目名称</td>
+              <td style="width: 10%;">项目部门</td>
+              <td style="width: 9%;">发生日期</td>
+              <td style="width: 13%;">费用实际所属类型</td>
+              <td style="width: 10%;">发票内容</td>
+              <td style="width: 8%;">单据张数</td>
+              <td style="width: 8%;">金额</td>
+              <td style="width: 10%;">备注</td>
+              <td style="width: 10%;">操作</td>
+            </tr>
+            <tbody class="tbody tbodyQjsq">
+            </tbody>
+          </table>
+        </div>
       </div>
-      <div class="qjsjxx-box">
-        <table class="form-table-info">
-          <tr style="height: 37px;">
-            <td style="width: 2%;"></td>
-            <td style="width: 20%;">项目名称</td>
-            <td style="width: 10%;">项目部门</td>
-            <td style="width: 9%;">发生日期</td>
-            <td style="width: 13%;">费用实际所属类型</td>
-            <td style="width: 10%;">发票内容</td>
-            <td style="width: 8%;">单据张数</td>
-            <td style="width: 8%;">金额</td>
-            <td style="width: 10%;">备注</td>
-            <td style="width: 10%;">操作</td>
-          </tr>
-          <tbody class="tbody tbodyQjsq">
-          </tbody>
-        </table>
+      <div class="ow-tab-content" name="yj">
+        <#if WORKFLOW.OPINION! !="">
+          <div class="form-title">
+            <div class="form-icon">
+              <img src="/imgs/titleIcon.png" alt="">
+              <span>审批意见</span>
+            </div>
+            <div class="form-btn">
+            </div>
+          </div>
+          <div class="qjsjxx-box">
+            <div class="z-form-wrap" name="opinionsDiv">
+              <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+            </div>
+          </div>
+        </#if>
       </div>
     </div>
   </div>

zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -1,4 +1,5 @@
 (function () {
+  var addDataThat = null;
   let isTimes = []
   let viewState = z.ui.comm.getUrlParam("_o");
   let read = z.ui.comm.getUrlParam("read");
@@ -9,6 +10,8 @@
     let timeObject = document.querySelector('#detailList')
     let arrays = JSON.parse(timeObject.value)
     $("#addData").click(function () {
+      addDataThat = $(this)
+      addDataThat.attr('disabled',"true");
       let obj = {
         amount: "",
         bz1: "",
@@ -133,6 +136,9 @@
           + '</div>'
           + '</td>'
           + '<td>'
+          + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
+          + '<span>保存</span>'
+          + '</div>'
           + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
           + '<span>删除</span>'
           + '</div>'
@@ -251,6 +257,9 @@
         + '</div>'
         + '</td>'
         + '<td>'
+        + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
+        + '<span>保存</span>'
+        + '</div>'
         + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
         + '<span>删除</span>'
         + '</div>'
@@ -267,6 +276,22 @@
       detailProjectIndex = i;
       selectProject(null, setProject);
     })
+    $("#editBtn_"+i).click(function(){
+        const span = $(this).find("span");
+        const html = span.html();
+        if(html === '编辑'){
+            span.html('保存')
+            addDataThat.attr('disabled',"true");
+            $("#qjsj_"+i).removeClass("form-table-disable")
+            return;
+        }
+        if(html === '保存'){
+            span.html('编辑')
+            addDataThat.removeAttr('disabled')
+            $("#qjsj_"+i).addClass("form-table-disable")
+            return;
+        }
+    })
     $("#delBtn_" + i).click(function () {
       z.ui.confirm("compid").init({
         content: "确定删除吗？",

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

@@ -1,160 +1,188 @@
 <@w.workFlow javascripts=['/Leave/js/index.js','/js/moment.js','/Leave/js/leaveTimeAuth.js']
 styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css' ]>
-    <div class="z-position form-boss" name="createReqVO">
+    <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">
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
             <input type="text" value="${formEntity.leaveHours!}" name="createReqVO$leaveHours">
             <input type="text" value='${timeObject!}' id="timeObject">
         </div>
-        <div class="form-title" style="margin-top: 0px;">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>基本信息</span>
-            </div>
-            <div class="form-btn">
-            </div>
-        </div>
-        <div class="jbxx-box jbxx-box-flex">
-            <table class="jbxx-table-info">
-                <tr>
-                    <td class="th">
-                        <div class="form-label">请假人：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input z-readonly" name="createReqVO$userNickname">
-                                    <input type="text" value="${formEntity.userNickname!}">
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content" name="jbxx">
+                <div class="form-title" style="margin-top: 0px;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>基本信息</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">请假人：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$userNickname">
+                                            <input type="text" value="${formEntity.userNickname!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">所在部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input z-readonly" name="createReqVO$deptName">
-                                    <input type="text" value="${formEntity.deptName!}">
+                            </td>
+                            <td class="th">
+                                <div class="form-label">所在部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                            <input type="text" value="${formEntity.deptName!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">申请时间：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                                    <input type="text" value="${(formEntity.createTime?date)!}">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">申请时间：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                                            <input type="text" value="${(formEntity.createTime?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">请假单号：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$leaveNo">
-                                    <input type="text" value="${formEntity.leaveNo!}">
+                            </td>
+                            <td class="th">
+                                <div class="form-label">请假单号：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$leaveNo">
+                                            <input type="text" value="${formEntity.leaveNo!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">休假类型：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$leaveType"
-                                     data='${leaveTypeJSON!}' value="${formEntity.leaveType!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">休假类型：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$leaveType"
+                                             data='${leaveTypeJSON!}' value="${formEntity.leaveType!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">休假天数：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input z-readonly" name="createReqVO$leaveDays">
-                                    <input type="text" value="${formEntity.leaveDays!}">
+                            </td>
+                            <td class="th">
+                                <div class="form-label">休假天数：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$leaveDays">
+                                            <input type="text" value="${formEntity.leaveDays!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr class="attendance-type-show">
-                    <td class="th">
-                        <div class="form-label">考勤类型：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="z-form-group ">
-                            <div class="z-form-control ">
-                                <div class="z-comp-radio" name="demoForm2$field4">
-                                    <div class="z-radio-item checked" value="0"><i></i>上班晚一小时</div>
-                                    <div class="z-radio-item" value="1"><i></i>下班早一小时</div>
+                            </td>
+                        </tr>
+                        <tr class="attendance-type-show">
+                            <td class="th">
+                                <div class="form-label">考勤类型：</div>
+                            </td>
+                            <td colspan="3">
+                                <div class="z-form-group ">
+                                    <div class="z-form-control ">
+                                        <div class="z-comp-radio" name="demoForm2$field4">
+                                            <div class="z-radio-item checked" value="0"><i></i>上班晚一小时</div>
+                                            <div class="z-radio-item" value="1"><i></i>下班早一小时</div>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="th">
-                        <div class="form-label">请假原因：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item" style="margin: 10px 0;">
-                                <div class="z-comp-textarea" name="createReqVO$leaveReason">
-                                    <textarea>${formEntity.leaveReason!}</textarea>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">请假原因：</div>
+                            </td>
+                            <td colspan="3">
+                                <div class="form-group">
+                                    <div class="form-item" style="margin: 10px 0;">
+                                        <div class="z-comp-textarea" name="createReqVO$leaveReason">
+                                            <textarea>${formEntity.leaveReason!}</textarea>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>请假时间信息</span>
+                    </div>
+                    <div class="form-btn" name="addButton">
+                        <div id="addData">
+                            <img src="/imgs/addIcon.png" alt="">
+                            <span>新增</span>
                         </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="form-title">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>请假时间信息</span>
-            </div>
-            <div class="form-btn" name="addButton">
-                <div id="addData">
-                    <img src="/imgs/addIcon.png" alt="">
-                    <span>新增</span>
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <table class="form-table-info">
+                        <thead>
+                        <tr>
+                            <td>序号</td>
+                            <td style="width: 30%;">起始时间</td>
+                            <td style="width: 30%;">截止时间</td>
+                            <td>备注</td>
+                            <td>操作</td>
+                        </tr>
+                        </thead>
+                        <tbody class="tbody tbodyQjsq"></tbody>
+                    </table>
                 </div>
             </div>
+            <div class="ow-tab-content" name="yj">
+                <#if WORKFLOW.OPINION! !="">
+                    <div class="form-title">
+                        <div class="form-icon">
+                            <img src="/imgs/titleIcon.png" alt="">
+                            <span>审批意见</span>
+                        </div>
+                        <div class="form-btn">
+                        </div>
+                    </div>
+                    <div class="qjsjxx-box">
+                        <div class="z-form-wrap" name="opinionsDiv">
+                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                        </div>
+                    </div>
+                </#if>
+            </div>
         </div>
-        <div class="qjsjxx-box">
-            <table class="form-table-info">
-                <thead>
-                <tr>
-                    <td>序号</td>
-                    <td style="width: 30%;">起始时间</td>
-                    <td style="width: 30%;">截止时间</td>
-                    <td>备注</td>
-                    <td>操作</td>
-                </tr>
-                </thead>
-                <tbody class="tbody tbodyQjsq"></tbody>
-            </table>
-        </div>
+
     </div>
     <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
     <script language="javascript">

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

@@ -6,156 +6,184 @@
       <input type="text" value="${formEntity.id!}" name="createReqVO$id">
       <input type="text" value='${timeObject!}' id="timeObject">
     </div>
-    <div class="form-title" style="margin-top: 0px;">
-      <div class="form-icon">
-        <img src="/imgs/titleIcon.png" alt="">
-        <span>基本信息</span>
-      </div>
-      <div class="form-btn">
-      </div>
-    </div>
-    <div class="jbxx-box jbxx-box-flex">
-      <table class="jbxx-table-info">
-        <tr>
-          <td class="th">
-            <div class="form-label">出差人：</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="form-item">
-                <div class="z-comp-input" name="createReqVO$userNickname">
-                  <input type="text" value="${formEntity.userNickname!}">
+    <ul class="ow-tab-nav oa_tabBox">
+      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+      <#if WORKFLOW.OPINION! !="">
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+      </#if>
+    </ul>
+    <div class="ow-tab-scroll">
+      <div class="ow-tab-content" name="jbxx">
+        <div class="form-title" style="margin-top: 0px;">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>基本信息</span>
+          </div>
+          <div class="form-btn">
+          </div>
+        </div>
+        <div class="jbxx-box jbxx-box-flex">
+          <table class="jbxx-table-info">
+            <tr>
+              <td class="th">
+                <div class="form-label">出差人：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$userNickname">
+                      <input type="text" value="${formEntity.userNickname!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">所在部门：</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="form-item">
-                <div class="z-comp-input" name="createReqVO$deptName">
-                  <input type="text" value="${formEntity.deptName!}">
+              </td>
+              <td class="th">
+                <div class="form-label">所在部门：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$deptName">
+                      <input type="text" value="${formEntity.deptName!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">申请时间：</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="form-item">
-                <div class="z-comp-date z-readonly" name="createReqVO$createTime">
-                  <input type="text" value="${(formEntity.createTime?date)!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">申请时间：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                      <input type="text" value="${(formEntity.createTime?date)!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">出差单号：</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="form-item">
-                <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
-                  <input type="text" value="${formEntity.travelNo!}">
+              </td>
+              <td class="th">
+                <div class="form-label">出差单号：</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$attendanceNoteNo">
+                      <input type="text" value="${formEntity.travelNo!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">同行人：</div>
-          </td>
-          <td colspan="3">
-            <div class="form-group">
-              <div class="z-comp-selecttree" name="partners">
-                <input type="hidden" name="createReqVO$partners" value="${formEntity.partners!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.partnerNames!} </span><i></i>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">同行人：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="partners">
+                    <input type="hidden" name="createReqVO$partners" value="${formEntity.partners!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.partnerNames!} </span><i></i>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">出差的地点：</div>
-          </td>
-          <td colspan="3">
-            <div class="form-group">
-              <div class="form-item">
-                <div class="z-comp-input" name="createReqVO$travelPlace">
-                  <input type="text" value="${formEntity.travelPlace!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">出差的地点：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="z-comp-input" name="createReqVO$travelPlace">
+                      <input type="text" value="${formEntity.travelPlace!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">项目名称：</div>
-          </td>
-          <td colspan="3">
-            <div class="form-group">
-              <div class="form-item btns-form-box">
-                <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
-                <div class="z-comp-input" name="createReqVO$projectName">
-                  <input type="text" value="${projectName!}">
-                  <div id="selectProject" style="width: 50px; float: right;">
-                    <div class="btn btn-sm btn-primary">选择</div>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">项目名称：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item btns-form-box">
+                    <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
+                    <div class="z-comp-input" name="createReqVO$projectName">
+                      <input type="text" value="${projectName!}">
+                      <div id="selectProject" style="width: 50px; float: right;">
+                        <div class="btn btn-sm btn-primary">选择</div>
+                      </div>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">出差安排：</div>
-          </td>
-          <td colspan="3">
-            <div class="form-group">
-              <div class="form-item" style="margin: 10px 0;">
-                <div class="z-comp-textarea" name="createReqVO$travelReason">
-                  <textarea> ${formEntity.travelReason!} </textarea>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">出差安排：</div>
+              </td>
+              <td colspan="3">
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-textarea" name="createReqVO$travelReason">
+                      <textarea> ${formEntity.travelReason!} </textarea>
+                    </div>
+                  </div>
                 </div>
-              </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div class="form-title">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>出差时间信息</span>
+          </div>
+          <div class="form-btn">
+            <div id="addData">
+              <img src="/imgs/addIcon.png" alt="">
+              <span>新增</span>
             </div>
-          </td>
-        </tr>
-      </table>
-    </div>
-    <div class="form-title">
-      <div class="form-icon">
-        <img src="/imgs/titleIcon.png" alt="">
-        <span>出差时间信息</span>
-      </div>
-      <div class="form-btn">
-        <div id="addData">
-          <img src="/imgs/addIcon.png" alt="">
-          <span>新增</span>
+          </div>
+        </div>
+        <div class="qjsjxx-box">
+          <table class="form-table-info">
+            <tr>
+              <td>序号</td>
+              <td style="width: 30%;">起始时间</td>
+              <td style="width: 30%;">截止时间</td>
+              <td>备注</td>
+              <td>操作</td>
+            </tr>
+            <tbody class="tbody tbodyQjsq">
+            </tbody>
+          </table>
         </div>
       </div>
+      <div class="ow-tab-content" name="yj">
+        <#if WORKFLOW.OPINION! !="">
+          <div class="form-title">
+            <div class="form-icon">
+              <img src="/imgs/titleIcon.png" alt="">
+              <span>审批意见</span>
+            </div>
+            <div class="form-btn">
+            </div>
+          </div>
+          <div class="qjsjxx-box">
+            <div class="z-form-wrap" name="opinionsDiv">
+              <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+            </div>
+          </div>
+        </#if>
+      </div>
     </div>
-    <div class="qjsjxx-box">
-      <table class="form-table-info">
-        <tr>
-          <td>序号</td>
-          <td style="width: 30%;">起始时间</td>
-          <td style="width: 30%;">截止时间</td>
-          <td>备注</td>
-          <td>操作</td>
-        </tr>
-        <tbody class="tbody tbodyQjsq">
-        </tbody>
-      </table>
-    </div>
+
   </div>
   <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
   <script language="javascript">