解决css变成common问题

client/.env.dev

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://10.10.10.7:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://10.10.10.7:48080/admin-api/infra/file/upload'

client/src/router/modules/remaining.ts

@@ -73,7 +73,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/',
     component: OaLayout,
-    redirect: '/system/menu',
+    redirect: '/home',
     name: 'Home',
     meta: {},
     children: [

client/src/views/OaSystem/components/UserOrgTree/index.vue

@@ -14,9 +14,7 @@ import { ref, watch } from 'vue'
 import request from '@/config/axios'
 import { handleTree } from '@/utils/tree'
 
-defineOptions({
-  name: 'UserOrgTree'
-})
+defineOptions({ name: 'UserOrgTree' })
 const $props = defineProps<{
   modelValue: any
 }>()
@@ -24,7 +22,9 @@ const $emit = defineEmits<{
   (e: 'update:modelValue', v: any): void
 }>()
 const receiveUserId = ref<any[]>($props.modelValue)
-const allUserList = shallowReactive({ list: [] })
+const allUserList = shallowReactive<{
+  list: any
+}>({ list: [] })
 let sourceAllUserList: any[] = []
 
 const getAllUserSimpleByList = (): void => {

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.scss

@@ -1,4 +1,4 @@
-._ProjectDetail_xmxx {
+._ContractDetail_xmxx {
   display: flex;
   flex-direction: column;
   flex: 1;
@@ -13,6 +13,7 @@
         align-items: center;
         >li {
           padding: 5px 15px;
+          cursor: pointer;
         }
         &:first-child {
           >li {

client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -1,8 +1,21 @@
 <template>
-  <div class="_ProjectDetail_xmxx">
+  <div class="_ContractDetail_xmxx">
     <div class="header">
       <ul>
-        <li class="active">主合同</li>
+        <template v-if="contractDetail['children'].length > 0">
+          <li
+            :class="{ active: contractInfoIndex === 0 }"
+            @click="switchContractInfo(contractDetail, 0)"
+            >主合同</li
+          >
+          <li
+            v-for="(item, index) in contractDetail['children']"
+            :class="{ active: contractInfoIndex === index + 1 }"
+            :key="index"
+            @click="switchContractInfo(item, index + 1)"
+            >分包合同
+          </li>
+        </template>
       </ul>
     </div>
     <div class="content">
@@ -23,31 +36,51 @@
           <table>
             <tr>
               <td class="th">合同编号：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['contractNumber']" :disabled="!editor" /></td>
               <td class="th">合同主类型：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['mainType']" :disabled="!editor" /></td>
             </tr>
             <tr>
               <td class="th">委托方：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['assigneeId']" :disabled="!editor" /></td>
               <td class="th">委托方编号：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['clientId']" :disabled="!editor" /></td>
             </tr>
             <tr>
               <td class="th">受托方：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['assigneeId']" :disabled="!editor" /></td>
               <td class="th">合同次类型：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['secondType']" :disabled="!editor" /></td>
             </tr>
             <tr>
               <td class="th">合同拿出日期：</td>
-              <td>自然资源部</td>
+              <td>
+                <el-date-picker
+                  style="width: 100%"
+                  :disabled="true"
+                  v-model="contractDetail['contractOn']"
+                  type="date"
+                  @change="($evt) => (contractDetail['lxsj'] = $evt)"
+                  placeholder="请选择合同拿出时间"
+                />
+              </td>
               <td class="th">合同拿回日期：</td>
-              <td>自然资源部</td>
+              <td>
+                <el-date-picker
+                  style="width: 100%"
+                  :disabled="true"
+                  v-model="contractDetail['contractOff']"
+                  type="date"
+                  @change="($evt) => (contractDetail['lxsj'] = $evt)"
+                  placeholder="请选择合同拿回时间"
+                />
+              </td>
             </tr>
             <tr>
               <td class="th">销售经理：</td>
-              <td>自然资源部</td>
+              <td>
+                <UserOrgTree v-model="contractDetail['customerContactId']" :disabled="!editor" />
+              </td>
               <td class="th"></td>
               <td></td>
             </tr>
@@ -58,7 +91,7 @@
           <table>
             <tr>
               <td class="th">付款条件：</td>
-              <td></td>
+              <td><el-input v-model="contractDetail['zrbm']" :disabled="!editor" /></td>
             </tr>
           </table>
         </div>
@@ -67,9 +100,11 @@
           <table>
             <tr>
               <td class="th">质保金（元）：</td>
-              <td>自然资源部</td>
+              <td><el-input v-model="contractDetail['qualityMoney']" :disabled="!editor" /></td>
               <td class="th">质保金状态：</td>
-              <td>自然资源部</td>
+              <td
+                ><el-input v-model="contractDetail['qualityMoneyStatus']" :disabled="!editor"
+              /></td>
             </tr>
           </table>
         </div>
@@ -91,7 +126,9 @@
                   技术开发
                 </td>
                 <td>28500</td>
-                <td rowspan="5"></td>
+                <td rowspan="5"
+                  ><el-input v-model="contractDetail['taxHsjeJskf']" :disabled="!editor"
+                /></td>
                 <td rowspan="5"></td>
               </tr>
               <tr>
@@ -99,25 +136,25 @@
                   <span>6%</span>
                   服务
                 </td>
-                <td>28500</td>
+                <td><el-input v-model="contractDetail['taxHsjeFw']" :disabled="!editor" /></td>
               </tr>
               <tr>
                 <td class="title">
                   <span>13%</span>
                   产品软件
                 </td>
-                <td>28500</td>
+                <td><el-input v-model="contractDetail['taxHsjeRjcp']" :disabled="!editor" /></td>
               </tr>
               <tr>
                 <td class="title">
                   <span>13%</span>
                   硬件（平板等）
                 </td>
-                <td>28500</td>
+                <td><el-input v-model="contractDetail['taxHsjeYj']" :disabled="!editor" /></td>
               </tr>
               <tr class="subtotal">
                 <td> 小计 </td>
-                <td>28500</td>
+                <td><el-input v-model="contractDetail['taxHsjeTotal']" :disabled="!editor" /></td>
               </tr>
             </tbody>
           </table>
@@ -138,15 +175,17 @@
               </tr>
             </thead>
             <tbody>
-              <tr>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
+              <tr v-for="(item, index) in contractMilestonList" :key="index">
+                <td>{{ index }}</td>
+                <td>{{ item['name'] }}</td>
+                <td>{{ (item['actualReturnAmount'] / (item['returnAmount'] || 1)) * 100 }}</td>
+                <td>{{ item['returnAmount'] }}</td>
+                <td>{{ item['actualReturnAmount'] }}</td>
+                <td>{{ item['planReturnTime'] }}</td>
+                <td>{{ item['description'] }}</td>
+                <td>
+                  <span>开票申请</span>
+                </td>
               </tr>
             </tbody>
           </table>
@@ -170,17 +209,19 @@
               </tr>
             </thead>
             <tbody>
-              <tr>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
+              <tr v-for="(item, index) in contractRMoneyList" :key="index">
+                <td>{{ index }}</td>
+                <td>{{ item['contractMilestoneName'] }}</td>
+                <td>{{ item['flowStatus'] }}</td>
+                <td>{{ item['invoiceAmount'] }}</td>
+                <td>{{ item['invoiceContent'] }}</td>
+                <td>{{ item['invoiceDate'] }}</td>
+                <td>{{ item['invoiceNo'] }}</td>
+                <td>{{ invoiceTypeFilter(item['invoiceType']) }}</td>
+                <td>{{ item['returnDate'] }}</td>
+                <td>
+                  <span>查看流程</span>
+                </td>
                 <td></td>
               </tr>
             </tbody>
@@ -202,35 +243,67 @@
           <table>
             <tr>
               <td class="th">分包理由：</td>
-              <td colspan="3"></td>
+              <td colspan="3">
+                <el-input v-model="contractDetail['subReason']" :disabled="!editor" />
+              </td>
             </tr>
             <tr>
               <td class="th">采购内容需求：</td>
-              <td colspan="3"></td>
+              <td colspan="3">
+                <el-input v-model="contractDetail['purchaseRequirements']" :disabled="!editor" />
+              </td>
             </tr>
             <tr>
               <td class="th">分包合同额（元）：</td>
-              <td>2000</td>
+              <td>
+                <el-input v-model="contractDetail['subAmount']" :disabled="!editor" />
+              </td>
               <td class="th">合同编号：</td>
-              <td></td>
+              <td>
+                <el-input v-model="contractDetail['contractNumber']" :disabled="!editor" />
+              </td>
             </tr>
             <tr>
               <td class="th">委托方：</td>
-              <td></td>
+              <td>
+                <el-input v-model="contractDetail['clientId']" :disabled="!editor" />
+              </td>
               <td class="th">申请人：</td>
-              <td></td>
+              <td>
+                <el-input v-model="contractDetail['applicantName']" :disabled="!editor" />
+              </td>
             </tr>
             <tr>
               <td class="th">合同拿出日期：</td>
-              <td>自然资源部</td>
+              <td>
+                <el-date-picker
+                  style="width: 100%"
+                  :disabled="true"
+                  v-model="contractDetail['contractOn']"
+                  type="date"
+                  @change="($evt) => (contractDetail['lxsj'] = $evt)"
+                  placeholder="请选择合同拿出时间"
+                />
+              </td>
               <td class="th">合同拿回日期：</td>
-              <td>自然资源部</td>
+              <td>
+                <el-date-picker
+                  style="width: 100%"
+                  :disabled="true"
+                  v-model="contractDetail['contractOff']"
+                  type="date"
+                  @change="($evt) => (contractDetail['lxsj'] = $evt)"
+                  placeholder="请选择合同拿回时间"
+                />
+              </td>
             </tr>
             <tr>
               <td class="th">供应商：</td>
-              <td></td>
+              <td>
+                <el-input v-model="contractDetail['subReason']" :disabled="!editor" />
+              </td>
               <td class="th"></td>
-              <td></td>
+              <td> </td>
             </tr>
           </table>
         </div>
@@ -239,7 +312,7 @@
           <table>
             <tr>
               <td class="th">付款条件：</td>
-              <td colspan="3"></td>
+              <td colspan="3">{{ contractDetail['paymentTerms'] }}</td>
             </tr>
           </table>
         </div>
@@ -342,17 +415,25 @@
 </template>
 <script setup lang="ts">
 import request from '@/config/axios'
+import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
+
 defineOptions({ name: 'XmhtComp' })
 const _mainProjectId: any = useRoute().query.id
 
-const contractInfoIndex: number = ref<number>(1)
+const editor = ref<Boolean>(false)
+/**
+ * 切换子项目信息
+ * **/
+const contractInfoIndex = ref<number>(0)
+const switchContractInfo = (item: any, key: number): void => {
+  contractInfoIndex.value = key
+}
 /***
  * 查询主合同和子合同详情数据
  * **/
-const subProjectShow = ref<boolean>(false)
 const contractDetail = ref({
   id: '',
-  children: []
+  children: [] as any
 })
 function queryContractWithChildByList(): void {
   const urlApi = `/contract-with-children`
@@ -360,9 +441,16 @@ function queryContractWithChildByList(): void {
     projectId: _mainProjectId
   }
   request.get({ url: urlApi, params: sendData }, '/business').then((resultData) => {
-    contractDetail.value = resultData
+    // contractDetail.value = resultData
+    contractDetail.value = { id: '', children: [] }
+    contractDetail.value.children = [{}]
+    queryContractMilestoneByList(resultData['id'])
+    queryContractRMoneyByList(resultData['id'])
+    queryContractPaymentByList(resultData['id'])
+    queryContractSharingByList(resultData['id'])
   })
 }
+queryContractWithChildByList()
 //查询合同里程碑
 const contractMilestonList = ref([])
 function queryContractMilestoneByList(contractId: string): void {
@@ -385,6 +473,17 @@ function queryContractRMoneyByList(contractId: string): void {
     contractRMoneyList.value = resultData
   })
 }
+//@ts-ignore
+const invoiceTypeMap = {
+  '1': '增值税专用发票',
+  '2': '增值税普通发票',
+  '3': '服务业通用机打发票',
+  '4': '统一收款收据'
+}
+const invoiceTypeFilter: (val: number | string) => string = (val: number | string): string => {
+  if (!val) return ''
+  return invoiceTypeMap[val.toString()]
+}
 /**
  * 编辑保存合同信息
  * **/

client/src/views/OaSystem/projectCenter/projectDetail/components/xmxx/index.vue

@@ -86,18 +86,20 @@
                       />
                     </el-select>
                   </td>
-                  <td class="th">预估工期（天）：</td>
+                  <td class="th">预估金额（元）：</td>
                   <td>
-                    <el-input v-model="projectDetail['yggq']" :disabled="!editor" />
+                    <el-input v-model="projectDetail['ygje']" :disabled="!editor" />
                   </td>
                 </tr>
                 <tr>
+                  <td class="th">预估工期（天）：</td>
+                  <td>
+                    <el-input v-model="projectDetail['yggq']" :disabled="!editor" />
+                  </td>
                   <td class="th">归属公司：</td>
                   <td>
                     <el-input v-model="projectDetail['belongCompanyname']" :disabled="!editor" />
                   </td>
-                  <td class="th"></td>
-                  <td> </td>
                 </tr>
               </table>
             </div>
@@ -190,7 +192,7 @@
             <div class="userInfo">
               <div class="titleBox">
                 <h4>{{ item['workerName'] }}</h4>
-                <span class="tag">{{ item['responsibility'] }}</span>
+                <span class="tag" v-if="item['responsibility']">{{ item['responsibility'] }}</span>
               </div>
               <p class="dept">{{ item['deptName'] }}</p>
               <p class="txt">毕业院校：浙江水利水电职业技术学院</p>

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

@@ -169,15 +169,15 @@
   box-sizing: border-box;
 }
 
-.jbxx-table-info tr td:nth-child(2n-1) {
-  width: 170px;
-  text-align: right;
-}
+/*.jbxx-table-info tr td:nth-child(2n-1) {*/
+  /*width: 170px;*/
+  /*text-align: right;*/
+/*}*/
 
-.jbxx-table-info tr td:nth-child(2n) {
-  text-align: left;
-  width: calc(50% - 170px);
-}
+/*.jbxx-table-info tr td:nth-child(2n) {*/
+  /*text-align: left;*/
+  /*width: calc(50% - 170px);*/
+/*}*/
 .form-td-table table {
   width: 100%;
   border-collapse: collapse;

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

@@ -1,181 +1,389 @@
 <@w.workFlow javascripts=['/FlowContract/js/apply.js','/flow/js/formCommon.js']
-  styles=[ '/flow/css/formCommon.css' ]>
+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="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">
-      <table class="jbxx-table-info">
-        <tr>
-          <td>
-            <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>
-            <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 >
-            <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 class="oa_tabBox">
+          <ul class="z-tab-bar">
+              <li z-tabindex="0" class="on"><a href="#test1">基础信息A</a></li>
+              <li z-tabindex="1"><a href="#test2">基础信息B</a></li>
+        <#if WORKFLOW.MATERIALS! != "">
+            <li z-tabindex="2"><a>收件材料</a></li>
+        </#if>
+        <#if WORKFLOW.OPINION! != "">
+            <li z-tabindex="3"><a>意见内容</a></li>
+        </#if>
+              </ul>
+          </div>
+
+      <div class="z-tab-scroll">
+          <div class="z-tab-content on" id="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>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <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 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>
-          </td>
-          <td>
-            <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>
-            <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>
-            <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>
-            <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>
-          <td>
-            <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>
-            <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 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">
+                                      <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>
+                      </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-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>
+                          <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 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>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <div class="form-label">税率与金额：</div>
-          </td>
-          <td colspan="3" class="form-td-table">
-            <table>
+              <!-- <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 style="width: 20%;">税率及内容</td>
-                <td>含税金额（元）</td>
-                <td>综合税率</td>
-                <td>不含税总额（元）</td>
-                <td>软件产品</td>
+                <th>税率与内容</th>
+                <th>含税金额（元）</th>
+                <th>综合税率</th>
+                <th>不含税总额（元）</th>
+                <th>软件产品</th>
               </tr>
               <tr>
-                <td>0%技术开发</td>
+                <th>0%技术开发</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -185,7 +393,7 @@
                     </div>
                   </div>
                 </td>
-                <td rowspan="7">
+                <td rowspan="5">
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
                       <div class="z-comp-input" name="contract$taxZhsl">
@@ -194,16 +402,16 @@
                     </div>
                   </div>
                 </td>
-                <td rowspan="7">
+                <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>  
+                  </div>
                 </td>
-                <td rowspan="7">
+                <td rowspan="5">
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
                       <div class="z-comp-input" name="contract$taxSoftpatent">
@@ -214,7 +422,7 @@
                 </td>
               </tr>
               <tr>
-                <td>6%服务</td>
+                <th>6%服务</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -226,7 +434,7 @@
                 </td>
               </tr>
               <tr>
-                <td>13%产品软件</td>
+                <th>13%产品软件</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -238,7 +446,7 @@
                 </td>
               </tr>
               <tr>
-                <td>13%硬件（平板等）</td>
+                <th>13%硬件（平板等）</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -250,7 +458,7 @@
                 </td>
               </tr>
               <tr>
-                <td>小计</td>
+                <th>小计</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -261,18 +469,9 @@
                   </div>
                 </td>
               </tr>
-            </table>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <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%;">
+                <th>是否有维护期</th>
+                <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
                       <div class="z-comp-radio" name="contract$whtkIWhq">
@@ -282,8 +481,8 @@
                     </div>
                   </div>
                 </td>
-                <td style="width: 25%;">是否免费维护</td>
-                <td style="width: 25%;">
+                <th>是否免费维护</th>
+                <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
                       <div class="z-comp-radio" name="contract$whtkIMfwh">
@@ -295,7 +494,7 @@
                 </td>
               </tr>
               <tr>
-                <td>维护开始日期</td>
+                <th>维护开始日期</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -305,7 +504,7 @@
                     </div>
                   </div>
                 </td>
-                <td>维护截止日期</td>
+                <th>维护截止日期</th>
                 <td>
                   <div class="form-group">
                     <div class="form-item" style="margin: 10px 0;">
@@ -317,351 +516,852 @@
                 </td>
               </tr>
             </table>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <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>
-            <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>
+        </div> -->
+              <div class="form-title">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>甲乙方信息</span>
+                  </div>
+                  <div class="form-btn">
+                  </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 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>
-            </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 class="form-title">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>到期提醒</span>
+                  </div>
+                  <div class="form-btn">
+                  </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 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>
-            </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 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>
-            </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 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>
-            </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>
+          <div class="z-tab-content on" id="test2">
+              <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>
-            </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 class="form-title" style="margin-top: 0px;">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>基本信息222</span>
+                  </div>
+                  <div class="form-btn">
+                  </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 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">
+                                      <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>
+                      </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-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>
+                          <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 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>
-            </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 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>
-            </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 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>
-            </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 class="form-title">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>到期提醒</span>
+                  </div>
+                  <div class="form-btn">
+                  </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 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>
-            </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 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>
-          </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 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>
-          </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>
-  <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>
   <#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 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 class="z-form-wrap" name="opinionsDiv">
+            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+        </div>
     </div>
   </#if>
   </div>
   <style type="text/css">
+      .oa_tabBox {
+          border-bottom: 2px solid #E1E9F5;
+      }
+      .oa_tabBox>.z-tab-bar {
+          border-bottom: 0px;
+      }
+      .oa_tabBox>.z-tab-bar .on {
+          border-bottom: 0px;
+      }
+      .oa_tabBox>.z-tab-bar a {
+          font-size: 18px;
+          font-weight: bold;
+      }
+      .oa_tabBox>.z-tab-bar .on>a {
+          border-bottom: 3px solid #2E77E6;
+          color: #2E77E6;
+      }
+      .z-tab-scroll {
+          padding: 15px;
+          border: 1px solid #f00;
+          height: 400px;
+          overflow-y: auto;
+      }
+      .jbxx-box-flex .th {
+          width: 160px !important;
+      }
+      .jbxx-box-flex>table>tbody>tr {
+          display: flex;
+          height: auto !important;
+      }
+      .jbxx-box-flex>table>tbody>tr>td {
+          padding: 10px 10px;
+      }
+      .jbxx-box-flex>table>tbody>tr>td:not(.th) {
+          flex: 1;
+      }
   </style>
 </@w.workFlow>