Browse Source

表单tab页修改

ljy121 1 year ago
parent
commit
fd90c30bb7

+ 52 - 703
zjugis-business/src/main/resources/templates/FlowContract/apply.ftl

@@ -3,681 +3,13 @@ styles=[ '/flow/css/formCommon.css' ]>
   <div class="z-position form-boss ow-tab" name="flow-form">
       <div class="oa_tabBox">
           <ul class="z-tab-bar">
-              <li z-tabindex="0" class="ow-tab-item on" data-name="test1">基础信息A</li>
-              <li z-tabindex="1" class="ow-tab-item" data-name="test2">基础信息B</li>
-        <#if WORKFLOW.MATERIALS! != "">
-            <li z-tabindex="2">收件材料</li>
-        </#if>
-        <#if WORKFLOW.OPINION! != "">
-            <li z-tabindex="3">意见内容</li>
-        </#if>
-              </ul>
-          </div>
-
-      <div class="ow-tab-scroll">
-          <div class="ow-tab-content" name="test1">
-              <div class="z-form-row" style="display: none;">
-                  <input type="text" value="${formEntity.instanceId!}" name="contract$instanceId">
-                  <input type="text" value="${formEntity.id!}" name="contract$id">
-              </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 colspan="3">
-                              <div class="form-group">
-                                  <div class="form-item">
-                                      <div class="z-comp-input" name="contract$name">
-                                          <input type="text" value="${formEntity.name!}">
-                                      </div>
-                                  </div>
-                              </div>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="th">
-                              <div class="form-label">合同编号:</div>
-                          </td>
-                          <td>
-                              <div class="form-group">
-                                  <div class="form-item btns-form-box">
-                                      <div class="z-comp-input" name="contract$contractNumber">
-                                          <input type="text" value="${formEntity.contractNumber!}">
-                                          <div id="generateSerial" style="width: 50px; ">
-                                              <div class="btn btn-sm btn-primary">生成</div>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </div>
-                          </td>
-                          <td class="th">
-                              <div class="form-label">合同金额(元):</div>
-                          </td>
-                          <td>
-                              <div class="form-group">
-                                  <div class="form-item btns-form-box">
-                                      <div class="z-comp-input" name="contract$contractAmount">
-                                          <input type="text" value="${formEntity.contractAmount!}">
-                                      </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="form-item">
-                                          <div class="z-comp-select" name="contract$mainType"
-                                               data='${mainTypeList!}'>
-                                              <div class="z-inputselect-bar">
-                                                  <span> ${mainType!} </span><i></i>
-                                              </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-select" name="contract$secondType"
-                                           data='${secondTypeList!}'>
-                                          <div class="z-inputselect-bar">
-                                              <span> ${secondType!} </span><i></i>
-                                          </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-date" name="contract$contractOn">
-                                      <input type="text" value="${formEntity.contractOn!}">
-                                  </div>
-                              </div>
-                          </td>
-                          <td class="th">
-                              <div class="form-label">合同拿回日期:</div>
-                          </td>
-                          <td>
-                              <div class="form-group">
-                                  <div class="z-comp-date" name="contract$contractOff">
-                                      <input type="text" value="${formEntity.contractOff!}">
-                                  </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="contract$isSign"
-                                           data='${isSignList!}'>
-                                          <div class="z-inputselect-bar">
-                                              <span> ${isSign!} </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="contract$signWay"
-                                           data='${signWayList!}'>
-                                          <div class="z-inputselect-bar">
-                                              <span> ${signWay!} </span><i></i>
-                                          </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-radio" name="contract$isBusinessUnit">
-                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 0>checked</#if>" value="0"><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="contract$paymentTerms">
-                                          <textarea> ${formEntity.paymentTerms!} </textarea>
-                                      </div>
-                                  </div>
-                              </div>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="th">
-                              <div class="form-label">税率与金额:</div>
-                          </td>
-                          <td colspan="3" class="form-td-table">
-                              <table>
-                                  <tr>
-                                      <td style="width: 20%;">税率及内容</td>
-                                      <td>含税金额(元)</td>
-                                      <td>综合税率</td>
-                                      <td>不含税总额(元)</td>
-                                      <td>软件产品</td>
-                                  </tr>
-                                  <tr>
-                                      <td>0%技术开发</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxHsjeJskf">
-                                                      <input type="text" value="${formEntity.taxHsjeJskf!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                      <td rowspan="7">
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxZhsl">
-                                                      <input type="text" value="${formEntity.taxZhsl!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                      <td rowspan="7">
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxBhsze">
-                                                      <input type="text" value="${formEntity.taxBhsze!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                      <td rowspan="7">
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxSoftpatent">
-                                                      <input type="text" value="${formEntity.taxSoftpatent!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                                  <tr>
-                                      <td>6%服务</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxHsjeFw">
-                                                      <input type="text" value="${formEntity.taxHsjeFw!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                                  <tr>
-                                      <td>13%产品软件</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxHsjeRjcp">
-                                                      <input type="text" value="${formEntity.taxHsjeRjcp!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                                  <tr>
-                                      <td>13%硬件(平板等)</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxHsjeYj">
-                                                      <input type="text" value="${formEntity.taxHsjeYj!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                                  <tr>
-                                      <td>小计</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-input" name="contract$taxHsjeTotal">
-                                                      <input type="text" value="${formEntity.taxHsjeTotal!}" />
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                              </table>
-                          </td>
-                      </tr>
-                      <tr>
-                          <td class="th">
-                              <div class="form-label">维护条款:</div>
-                          </td>
-                          <td class="form-td-table-two" colspan="3">
-                              <table>
-                                  <tr>
-                                      <td style="width: 25%;">是否有维护期</td>
-                                      <td style="width: 25%;">
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-radio" name="contract$whtkIWhq">
-                                                      <div class="z-radio-item <#if (formEntity.whtkIWhq!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                                      <div class="z-radio-item <#if (formEntity.whtkIWhq!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                      <td style="width: 25%;">是否免费维护</td>
-                                      <td style="width: 25%;">
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-radio" name="contract$whtkIMfwh">
-                                                      <div class="z-radio-item <#if (formEntity.whtkIMfwh!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                                      <div class="z-radio-item <#if (formEntity.whtkIMfwh!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                                  <tr>
-                                      <td>维护开始日期</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-date" name="contract$whtkWhrqBegin">
-                                                      <input type="text" value="${formEntity.whtkWhrqBegin!}">
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                      <td>维护截止日期</td>
-                                      <td>
-                                          <div class="form-group">
-                                              <div class="form-item" style="margin: 10px 0;">
-                                                  <div class="z-comp-date" name="contract$whtkWhrqEnd">
-                                                      <input type="text" value="${formEntity.whtkWhrqEnd!}">
-                                                  </div>
-                                              </div>
-                                          </div>
-                                      </td>
-                                  </tr>
-                              </table>
-                          </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="contract$specialClause">
-                                          <textarea> ${formEntity.specialClause!} </textarea>
-                                      </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="contract$bz">
-                                          <textarea> ${formEntity.bz!} </textarea>
-                                      </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>
-        </div>
-        <div class="qjsjxx-box">
-          <div class="jbxx-box">
-            <table class="jbxx-table-info">
-              <tr>
-                <th>税率与内容</th>
-                <th>含税金额(元)</th>
-                <th>综合税率</th>
-                <th>不含税总额(元)</th>
-                <th>软件产品</th>
-              </tr>
-              <tr>
-                <th>0%技术开发</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxHsjeJskf">
-                        <input type="text" value="${formEntity.taxHsjeJskf!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <td rowspan="5">
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxZhsl">
-                        <input type="text" value="${formEntity.taxZhsl!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <td rowspan="5">
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxBhsze">
-                        <input type="text" value="${formEntity.taxBhsze!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <td rowspan="5">
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxSoftpatent">
-                        <input type="text" value="${formEntity.taxSoftpatent!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>6%服务</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxHsjeFw">
-                        <input type="text" value="${formEntity.taxHsjeFw!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>13%产品软件</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxHsjeRjcp">
-                        <input type="text" value="${formEntity.taxHsjeRjcp!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>13%硬件(平板等)</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxHsjeYj">
-                        <input type="text" value="${formEntity.taxHsjeYj!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>小计</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-input" name="contract$taxHsjeTotal">
-                        <input type="text" value="${formEntity.taxHsjeTotal!}" />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>是否有维护期</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-radio" name="contract$whtkIWhq">
-                        <div class="z-radio-item <#if (formEntity.whtkIWhq!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                        <div class="z-radio-item <#if (formEntity.whtkIWhq!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <th>是否免费维护</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-radio" name="contract$whtkIMfwh">
-                        <div class="z-radio-item <#if (formEntity.whtkIMfwh!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                        <div class="z-radio-item <#if (formEntity.whtkIMfwh!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <th>维护开始日期</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-date" name="contract$whtkWhrqBegin">
-                        <input type="text" value="${formEntity.whtkWhrqBegin!}">
-                      </div>
-                    </div>
-                  </div>
-                </td>
-                <th>维护截止日期</th>
-                <td>
-                  <div class="form-group">
-                    <div class="form-item" style="margin: 10px 0;">
-                      <div class="z-comp-date" name="contract$whtkWhrqEnd">
-                        <input type="text" value="${formEntity.whtkWhrqEnd!}">
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-        </div> -->
-              <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="jbxx-box">
-                      <table class="jbxx-table-info">
-                          <tr>
-                              <td>
-                                  <div class="form-label">委托方:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="z-comp-selecttree" name="client">
-                                          <input type="hidden" name="contract$clientId" value="${formEntity.clientId!}">
-                                          <input type="hidden" name="contract$clientName" value="${formEntity.clientName!}">
-                                          <div class="z-inputselect-bar">
-                                              <span> ${formEntity.clientName!} </span><i></i>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                              <td>
-                                  <div class="form-label">委托方编号:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="form-item">
-                                          <div class="z-comp-input" name="contract$clientNumber">
-                                              <input type="text" value="${formEntity.clientNumber!}">
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                          </tr>
-                          <tr>
-                              <td>
-                                  <div class="form-label">受托方:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="z-comp-selecttree" name="assignee">
-                                          <input type="hidden" name="contract$assigneeId" value="${formEntity.assigneeId!}">
-                                          <input type="hidden" name="contract$assigneeName" value="${formEntity.assigneeName!}">
-                                          <div class="z-inputselect-bar">
-                                              <span> ${formEntity.assigneeName!} </span><i></i>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                              <td>
-                                  <div class="form-label">区域经理:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="z-comp-selecttree" name="areaManager">
-                                          <input type="hidden" name="contract$areaManagerId" value="${formEntity.areaManagerId!}">
-                                          <input type="hidden" name="contract$areaManager" value="${formEntity.areaManager!}">
-                                          <div class="z-inputselect-bar">
-                                              <span> ${formEntity.areaManager!} </span><i></i>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                          <#-- <td>--> <#-- <div class="form-label">合同金额:
-          </div>--> <#-- </td>--> <#-- <td>--> <#-- <div class="form-group">--> <#-- <div class="form-item">--> <#-- <div class="z-comp-input" name="contract$contractAmount">--> <#-- <input type="text" value="${formEntity.contractAmount!}">--> <#-- </div>--> <#-- </div>--> <#-- </div>--> <#-- </td>--> </tr>
-                      </table>
-                  </div>
-              </div>
-              <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="jbxx-box">
-                      <table class="jbxx-table-info">
-                          <tr>
-                              <td>
-                                  <div class="form-label">是否到期提醒:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="form-item" style="margin: 10px 0;">
-                                          <div class="z-comp-radio" name="contract$isRemindExpiry">
-                                              <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                              <div class="z-radio-item <#if (formEntity.isRemindExpiry!-1) == 0>checked</#if>" value="0"><i></i>否</div>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                              <td>
-                                  <div class="form-label">合同预计签订时间:</div>
-                              </td>
-                              <td>
-                                  <div class="form-group">
-                                      <div class="form-item" style="margin: 10px 0;">
-                                          <div class="z-comp-date" name="contract$planSignDate">
-                                              <input type="text" value="${formEntity.planSignDate!}">
-                                          </div>
-                                      </div>
-                                  </div>
-                              </td>
-                          </tr>
-                      </table>
-                  </div>
-              </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>
-              <div class="qjsjxx-box">
-                  <table class="form-table-info">
-                      <thead>
-                      <tr>
-                          <td>序号</td>
-                          <td>里程碑信息</td>
-                          <td>回款比例</td>
-                          <td>应回款金额(元)</td>
-                          <td>已回款金额(元)</td>
-                          <td>预计到款时间</td>
-                          <td>说明</td>
-                          <td>操作</td>
-                      </tr>
-                      </thead>
-                      <tbody class="tbody tbodyQjsq" name="milestone"></tbody>
-                  </table>
-              </div>
-          </div>
-          <div class="ow-tab-content" name="test2">
+              <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+              <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+          </ul>
+      </div>
+
+      <div class="ow-tab-scroll">
+          <div class="ow-tab-content" name="jbxx">
               <div class="z-form-row" style="display: none;">
                   <input type="text" value="${formEntity.instanceId!}" name="contract$instanceId">
                   <input type="text" value="${formEntity.id!}" name="contract$id">
@@ -685,7 +17,7 @@ styles=[ '/flow/css/formCommon.css' ]>
               <div class="form-title" style="margin-top: 0px;">
                   <div class="form-icon">
                       <img src="/imgs/titleIcon.png" alt="">
-                      <span>基本信息222</span>
+                      <span>基本信息</span>
                   </div>
                   <div class="form-btn">
                   </div>
@@ -723,20 +55,18 @@ styles=[ '/flow/css/formCommon.css' ]>
                               </div>
                           </td>
                           <td class="th">
-                              <div class="form-label">签订状态:</div>
+                              <div class="form-label">合同金额(元):</div>
                           </td>
                           <td>
                               <div class="form-group">
-                                  <div class="form-item">
-                                      <div class="z-comp-select" name="contract$isSign"
-                                           data='${isSignList!}'>
-                                          <div class="z-inputselect-bar">
-                                              <span> ${isSign!} </span><i></i>
-                                          </div>
+                                  <div class="form-item btns-form-box">
+                                      <div class="z-comp-input" name="contract$contractAmount">
+                                          <input type="text" value="${formEntity.contractAmount!}">
                                       </div>
                                   </div>
                               </div>
                           </td>
+
                       </tr>
                       <tr>
                           <td class="th">
@@ -796,14 +126,16 @@ styles=[ '/flow/css/formCommon.css' ]>
                       </tr>
                       <tr>
                           <td class="th">
-                              <div class="form-label">事业部独立开拓:</div>
+                              <div class="form-label">签订状态:</div>
                           </td>
                           <td>
                               <div class="form-group">
                                   <div class="form-item">
-                                      <div class="z-comp-radio" name="contract$isBusinessUnit">
-                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 0>checked</#if>" value="0"><i></i>否</div>
+                                      <div class="z-comp-select" name="contract$isSign"
+                                           data='${isSignList!}'>
+                                          <div class="z-inputselect-bar">
+                                              <span> ${isSign!} </span><i></i>
+                                          </div>
                                       </div>
                                   </div>
                               </div>
@@ -824,6 +156,21 @@ styles=[ '/flow/css/formCommon.css' ]>
                               </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-radio" name="contract$isBusinessUnit">
+                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 1>checked</#if>" value="1"><i></i>是</div>
+                                          <div class="z-radio-item <#if (formEntity.isBusinessUnit!-1) == 0>checked</#if>" value="0"><i></i>否</div>
+                                      </div>
+                                  </div>
+                              </div>
+                          </td>
+                      </tr>
                       <tr>
                           <td class="th">
                               <div class="form-label">付款条件:</div>
@@ -1194,7 +541,6 @@ styles=[ '/flow/css/formCommon.css' ]>
                       </table>
                   </div>
               </div>
-
               <div class="form-title">
                   <div class="form-icon">
                       <img src="/imgs/titleIcon.png" alt="">
@@ -1224,23 +570,26 @@ styles=[ '/flow/css/formCommon.css' ]>
                       <tbody class="tbody tbodyQjsq" name="milestone"></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>
-  <#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>
   <style type="text/css">
       .jbxx-box-flex .th {

+ 223 - 211
zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -1,237 +1,249 @@
 <@w.workFlow javascripts=['/FlowProject/js/apply.js','/flow/js/formCommon.js']
   styles=[ '/flow/css/formCommon.css' ]>
-  <div class="z-position form-boss" name="flow-form">
-    <div class="z-form-row" style="display: none;">
-      <input type="text" value="${formEntity.instanceId!}" name="project$instanceId">
-      <input type="text" value="${formEntity.id!}" name="project$id">
+  <div class="z-position form-boss ow-tab" name="flow-form">
+    <div class="oa_tabBox">
+      <ul class="z-tab-bar">
+        <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+      </ul>
     </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="project$xmmc">
-                  <input type="text" value="${formEntity.xmmc!}">
+    <div class="ow-tab-scroll">
+      <div class="ow-tab-content on" name="jbxx">
+        <div class="z-form-row" style="display: none;">
+          <input type="text" value="${formEntity.instanceId!}" name="project$instanceId">
+          <input type="text" value="${formEntity.id!}" name="project$id">
+        </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="project$xmmc">
+                      <input type="text" value="${formEntity.xmmc!}">
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">项目经理:</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="z-comp-selecttree" name="xmjl">
-                <input type="hidden" name="project$xmjlId" value="${formEntity.xmjlId!}">
-                <input type="hidden" name="project$xmjl" value="${formEntity.xmjl!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.xmjl!} </span><i></i>
+              </td>
+              <td class="th">
+                <div class="form-label">项目经理:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="xmjl">
+                    <input type="hidden" name="project$xmjlId" value="${formEntity.xmjlId!}">
+                    <input type="hidden" name="project$xmjl" value="${formEntity.xmjl!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.xmjl!} </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="z-comp-selecttree" name="zrbm">
-                <input type="hidden" name="project$zrbmId" value="${formEntity.zrbmId!}">
-                <input type="hidden" name="project$zrbm" value="${formEntity.zrbm!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.zrbm!} </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="zrbm">
+                    <input type="hidden" name="project$zrbmId" value="${formEntity.zrbmId!}">
+                    <input type="hidden" name="project$zrbm" value="${formEntity.zrbm!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.zrbm!} </span><i></i>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">立项时间:</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="z-comp-date" name="project$lxsj">
-                <input type="text" value="${formEntity.lxsj!}">
-              </div>
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="th">
-            <div class="form-label">预估合同额:</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="z-comp-input" name="project$planContractAmount">
-                <input type="text" value="${formEntity.planContractAmount!}">
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">行政区:</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="z-comp-selecttree" name="area">
-                <input type="hidden" name="project$xzqdm" value="${formEntity.xzqdm!}">
-                <input type="hidden" name="project$xzqmc" value="${formEntity.xzqmc!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.xzqmc!} </span><i></i>
+              </td>
+              <td class="th">
+                <div class="form-label">立项时间:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-date" name="project$lxsj">
+                    <input type="text" value="${formEntity.lxsj!}">
+                  </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="projectType">
-                <input type="hidden" name="project$projectTypeId" value="${formEntity.projectTypeId!}">
-                <input type="hidden" name="project$projectTypeName" value="${formEntity.projectTypeName!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.projectTypeName!} </span><i></i>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">预估合同额:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-input" name="project$planContractAmount">
+                    <input type="text" value="${formEntity.planContractAmount!}">
+                  </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="form-item">
-                  <div class="z-comp-select" name="project$hyId"
-                    data='${hyTypeList!}'>
+              </td>
+              <td class="th">
+                <div class="form-label">行政区:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="area">
+                    <input type="hidden" name="project$xzqdm" value="${formEntity.xzqdm!}">
+                    <input type="hidden" name="project$xzqmc" value="${formEntity.xzqmc!}">
                     <div class="z-inputselect-bar">
-                      <span> ${hyName!} </span><i></i>
+                      <span> ${formEntity.xzqmc!} </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" style="margin: 10px 0;">
-                <div class="z-comp-input" name="project$yggq">
-                  <input type="text" value="${formEntity.yggq!}">
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">项目类型:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="projectType">
+                    <input type="hidden" name="project$projectTypeId" value="${formEntity.projectTypeId!}">
+                    <input type="hidden" name="project$projectTypeName" value="${formEntity.projectTypeName!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.projectTypeName!} </span><i></i>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </div>
-          </td>
-          <td class="th">
-            <div class="form-label">归属公司:</div>
-          </td>
-          <td>
-            <div class="form-group">
-              <div class="z-comp-selecttree" name="belongCompany">
-                <input type="hidden" name="project$belongCompanyid" value="${formEntity.belongCompanyid!}">
-                <input type="hidden" name="project$belongCompanyname" value="${formEntity.belongCompanyname!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.belongCompanyname!} </span><i></i>
+              </td>
+              <td class="th">
+                <div class="form-label">行业:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item">
+                    <div class="form-item">
+                      <div class="z-comp-select" name="project$hyId"
+                           data='${hyTypeList!}'>
+                        <div class="z-inputselect-bar">
+                          <span> ${hyName!} </span><i></i>
+                        </div>
+                      </div>
+                    </div>
+                  </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="xsry">
-                <input type="hidden" name="project$xsryId" value="${formEntity.xsryId!}">
-                <input type="hidden" name="project$xsry" value="${formEntity.xsry!}">
-                <div class="z-inputselect-bar">
-                  <span> ${formEntity.xsry!} </span><i></i>
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">预估工期(天):</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="form-item" style="margin: 10px 0;">
+                    <div class="z-comp-input" name="project$yggq">
+                      <input type="text" value="${formEntity.yggq!}">
+                    </div>
+                  </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>
-    </div>
-    <div class="qjsjxx-box jbxx-box-flex">
-      <div class="jbxx-box">
-        <table class="jbxx-table-info">
-          <tr>
-            <td class="th">
-              <div class="form-label">是否签合同:</div>
-            </td>
-            <td>
-              <div class="form-group">
-                <div class="z-comp-radio" name="project$isSign">
-                  <div class="z-radio-item <#if (formEntity.isSign!-1) == 1>checked</#if>" value="1"><i></i>是</div>
-                  <div class="z-radio-item <#if (formEntity.isSign!-1) == 0>checked</#if>" value="0"><i></i>否</div>
+              </td>
+              <td class="th">
+                <div class="form-label">归属公司:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="belongCompany">
+                    <input type="hidden" name="project$belongCompanyid" value="${formEntity.belongCompanyid!}">
+                    <input type="hidden" name="project$belongCompanyname" value="${formEntity.belongCompanyname!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.belongCompanyname!} </span><i></i>
+                    </div>
+                  </div>
                 </div>
-              </div>
-            </td>
-            <td class="th">
-              <div class="form-label">利益分成(公司/部门):</div>
-            </td>
-            <td class="lyfc">
-              <div class="form-group">
-                <div class="form-item">
-                  <div class="z-comp-radio" name="project$shareRatio">
-                    <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.4>checked</#if>" value="0.4"><i></i> 60% / 40%</div>
-                    <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.375>checked</#if>" value="0.375"><i></i>62.5% / 37.5%</div>
-                    <div class="z-radio-item flexInputTwo" value=""><i></i>
-                      <input id="lyfcGs" type="text">%&nbsp;&nbsp;/&nbsp;&nbsp;  <input id="lyfcBm" type="text">%
+              </td>
+            </tr>
+            <tr>
+              <td class="th">
+                <div class="form-label">销售人员:</div>
+              </td>
+              <td>
+                <div class="form-group">
+                  <div class="z-comp-selecttree" name="xsry">
+                    <input type="hidden" name="project$xsryId" value="${formEntity.xsryId!}">
+                    <input type="hidden" name="project$xsry" value="${formEntity.xsry!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${formEntity.xsry!} </span><i></i>
                     </div>
                   </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <#if WORKFLOW.OPINION! !="">
-      <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 class="form-title">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>产值信息</span>
+          </div>
+          <div class="form-btn">
+          </div>
         </div>
-      </div>
-      <div class="qjsjxx-box">
-        <div class="z-form-wrap" name="opinionsDiv">
-          <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+        <div class="qjsjxx-box jbxx-box-flex">
+          <div class="jbxx-box">
+            <table class="jbxx-table-info">
+              <tr>
+                <td class="th">
+                  <div class="form-label">是否签合同:</div>
+                </td>
+                <td>
+                  <div class="form-group">
+                    <div class="z-comp-radio" name="project$isSign">
+                      <div class="z-radio-item <#if (formEntity.isSign!-1) == 1>checked</#if>" value="1"><i></i>是</div>
+                      <div class="z-radio-item <#if (formEntity.isSign!-1) == 0>checked</#if>" value="0"><i></i>否</div>
+                    </div>
+                  </div>
+                </td>
+                <td class="th">
+                  <div class="form-label">利益分成(公司/部门):</div>
+                </td>
+                <td class="lyfc">
+                  <div class="form-group">
+                    <div class="form-item">
+                      <div class="z-comp-radio" name="project$shareRatio">
+                        <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.4>checked</#if>" value="0.4"><i></i> 60% / 40%</div>
+                        <div class="z-radio-item <#if (formEntity.shareRatio!0) == 0.375>checked</#if>" value="0.375"><i></i>62.5% / 37.5%</div>
+                        <div class="z-radio-item flexInputTwo" value=""><i></i>
+                          <input id="lyfcGs" type="text">%&nbsp;&nbsp;/&nbsp;&nbsp;  <input id="lyfcBm" type="text">%
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </div>
         </div>
       </div>
-    </#if>
+      <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>
   <style type="text/css">
     .lyfc .z-comp-radio{