diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 2ee12b7..103db68 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -88,6 +88,7 @@
input {
/*width: 600px;*/
+ width: 100%;
border:0 none;
outline:none;
}
@@ -150,38 +151,24 @@
</div>
</div>
<!--startprint-->
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px; margin-bottom: 13px;" value="部门名称"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.deptName!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 6px;" value="项目编号"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <#--<textarea style="overflow:auto; background-attachment: fixed;
- background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
- <input readonly value="${project.projectNo!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 6px;" value="项目名称"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <#--<textarea style="overflow:auto; background-attachment: fixed;
- background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
- <input readonly value="${project.name!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目类型"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >部门名称:</th>
+ <td class="table-title" colspan="2" ><input readonly value="${project.deptName!}"/></td>
+ <th class="table-title" colspan="1" >项目编号:</th>
+ <td class="table-title" colspan="2" ><input readonly value="${project.projectNo!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >项目名称:</th>
+ <td class="table-title" colspan="5" ><input readonly value="${project.name!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >项目类型:</th>
+ <td class="table-title" colspan="1" >
<#if project.type??>
<#if (project.type) =1>
<input readonly value="工程集成类"/>
@@ -193,31 +180,15 @@
<#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 6px;" value="项目计划开始时间"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${(project.startDate?string("yyyy-MM-dd"))!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 6px;" value="项目计划结束时间"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${(project.endDate?string("yyyy-MM-dd"))!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资模式"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ </td>
+ <th class="table-title" colspan="1" >项目计划开始时间:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${(project.startDate?string("yyyy-MM-dd"))!}"/></td>
+ <th class="table-title" colspan="1" >项目计划结束时间:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${(project.endDate?string("yyyy-MM-dd"))!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >垫资模式:</th>
+ <td class="table-title" <#if project.underwrittenMode! == 2> colspan="5" <#else> colspan="1" </#if> >
<#if project.underwrittenMode??>
<#if (project.underwrittenMode) =1>
<input readonly value="A类-不垫资（战略合作）"/>
@@ -228,109 +199,52 @@
<#elseif (project.underwrittenMode) =4>
<input readonly value="D类-垫资（账期不覆盖）"/>
</#if>
- <#else>
+ <#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top" id="coop" <#if project.underwrittenMode! != 1>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="合作对象"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.collaborator!}"/>
- </div>
-
- <#if project.collaboratorUrl?? && project.collaboratorUrl != "">
- <div class="am-form-file am-text-xs">
- <#-- <button type="button" class="am-btn am-btn-primary am-btn-sm">-->
- <a href="${project.collaboratorUrl!}" download>
- <i class="am-icon-cloud-upload"></i> 下载附件
- </a>
- <#-- </button>-->
- </div>
- <#else>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </#if>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资利息"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.advanceInterestAmount)}元" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="垫资峰值"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.advancePeakAmount)}元" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;margin-bottom: 12px;" value="合同金额"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.contractAmount)}元"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="项目毛利"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.grossProfit)}元" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目毛利率"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.grossProfitMargin)}%" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="汇智产品金额"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.huizhiProductAmount, '0.00')}元"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华智产品金额"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.huazhiProductAmount, '0.00')}元"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="华三产品金额"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.huasanProductAmount, '0.00')}元"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;" value="其他产品金额"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${Utils.format(project.ziguangOtherAmount, '0.00')}元"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目把握度"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ </td>
+ <#if project.underwrittenMode! == 1>
+ <th class="table-title" colspan="1" >合作对象:</th>
+ <td class="table-title" colspan="3" ><input readonly value="${project.collaborator!}"/>
+ <#if project.collaboratorUrl?? && project.collaboratorUrl != "">
+ <div class="am-form-file am-text-xs">
+ <a href="${project.collaboratorUrl!}" download>
+ <i class="am-icon-cloud-upload"></i> 下载附件
+ </a>
+ </div>
+ <#else>
+ <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
+ </#if>
+ </td>
+ </#if>
+ <#if project.underwrittenMode! gt 2>
+ <th class="table-title" colspan="1" >垫资利息:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.advanceInterestAmount)}元" /></td>
+ <th class="table-title" colspan="1" >垫资峰值:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.advancePeakAmount)}元" /></td>
+ </#if>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >合同金额:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.contractAmount)}元"/></td>
+ <th class="table-title" colspan="1" >项目毛利:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.grossProfit)}元" /></td>
+ <th class="table-title" colspan="1" >项目毛利率:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.grossProfitMargin)}%" /></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >汇智产品金额:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.huizhiProductAmount, '0.00')}元"/></td>
+ <th class="table-title" colspan="1" >华智产品金额:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.huazhiProductAmount, '0.00')}元"/></td>
+ <th class="table-title" colspan="1" >华三产品金额:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.huasanProductAmount, '0.00')}元"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >其他产品金额:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.ziguangOtherAmount, '0.00')}元"/></td>
+ <th class="table-title" colspan="1" >项目把握度:</th>
+ <td class="table-title" colspan="1" >
<#if project.certainty??>
<#if (project.certainty) =1>
<input readonly value="A：项目成功率80%-100%"/>
@@ -342,23 +256,13 @@
<#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px;margin-bottom: 12px;" value="行业场景应用"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.industryScenario!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="项目解决方案"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ </td>
+ <th class="table-title" colspan="1" >行业场景应用:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${project.industryScenario!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >项目解决方案:</th>
+ <td class="table-title" colspan="1" >
<#if project.resolvePlan??>
<#if (project.resolvePlan!) =1>
<input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/>
@@ -370,39 +274,20 @@
<#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 6px;" value="客户名称"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <#-- <textarea style="overflow:auto; background-attachment: fixed;
- background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>-->
- <input readonly value="${project.customer!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 6px;" value="最终用户名称"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <#--<textarea style="overflow:auto; background-attachment: fixed;
- background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>-->
- <input readonly value="${project.terminalCustomer!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px;" value="价值及风险"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.valueRisk!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </td>
+ <th class="table-title" colspan="1" >客户名称:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${project.customer!}"/></td>
+ <th class="table-title" colspan="1" >最终用户名称:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${project.terminalCustomer!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >价值及风险:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="5" cols="20" style="border-style:none;"
+ >${project.valueRisk!}</textarea>
+ </td>
+ </tr>
+ </table>
<!--endprint-->
</div>
<!--验证表单元素（validate end-->
@@ -420,37 +305,22 @@
</div>
</div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 100px ;margin-bottom: 12px;" value="项目负责人"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.principal!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 12px;" value="预计合同签订时间"/></div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <input readonly value="${(project.contractTime?string("yyyy-MM-dd"))!}"/>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px ;margin-bottom: 12px;" value="项目计划招标时间"/></div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <input readonly value="${(project.bidsTime?string("yyyy-MM-dd"))!}"/>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 120px ;margin-bottom: 12px;" value="是否二次合作"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）其他信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >项目负责人:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${project.principal!}"/></td>
+ <th class="table-title" colspan="1" >预计合同签订时间:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${(project.contractTime?string("yyyy-MM-dd"))!}"/></td>
+ <th class="table-title" colspan="1" >项目计划招标时间:</th>
+ <td class="table-title" colspan="1" ><input readonly value="${(project.bidsTime?string("yyyy-MM-dd"))!}"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >是否二次合作:</th>
+ <td class="table-title" colspan="1" >
<#if project.isSecond??>
<#if (project.isSecond!) =1>
<input readonly value="是"/>
@@ -462,15 +332,9 @@
<#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px ;margin-bottom: 12px;" value="直签"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>
+ </td>
+ <th class="table-title" colspan="1" >直签:</th>
+ <td class="table-title" colspan="3" >
<#if project.signType??>
<#if (project.signType!) =1>
<input readonly value="紫光汇智直接投标"/>
@@ -480,34 +344,29 @@
<#else>
<input readonly value=""/>
</#if>
- </span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 140px;" value="主合同收款条款"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.mainContractCollectionTerms!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 160px;" value="主合同具体解决方案"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.mainContractResolvePlan!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 80px;" value="计收计划"/></div>
- <div class="am-u-sm-6 am-u-md-6">
- <input readonly value="${project.calculationCollection!}"/>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同收款条款:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" style="border-style:none;"
+ >${project.mainContractCollectionTerms!}</textarea>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同具体解决方案:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" style="border-style:none;"
+ >${project.mainContractResolvePlan!}</textarea>
+ </td> </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >计收计划:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" style="border-style:none;"
+ >${project.calculationCollection!}</textarea>
+ </td>
+ </tr>
+ </table>
</div>
</div>
<#-- <div class="am-tabs-bd">-->
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index e77414d..eaadbbc 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -17,9 +17,9 @@
select[readonly] option {
display: none;
}
- input[readonly]{
- background-color: #eee;
- }
+ /*input[readonly]{*/
+ /* background-color: #eee;*/
+ /*}*/
.am-btn-danger {
color: #f00;
@@ -160,7 +160,32 @@
}
/* 固定表头的table样式 end */
-
+ .table-title{
+ text-align: left;
+ }
+ input::-webkit-outer-spin-button,
+ input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ }
+ input[type="text"]{
+ -moz-appearance: textfield;
+ }
+ .am-table-striped>tbody>tr:nth-child(odd)>input[type="text"]{
+ background-color: #f9f9f9;
+ }
+ input[type="text"]:focus{
+ outline: none;
+ }
+ .table-inline {
+ /*width: 600px;*/
+ width: 100%;
+ border:0 none;
+ outline:none;
+ }
+ .sameline {
+ display: flex;
+ /*position: relative;*/
+ }
</style>
<div class="project_budget">
@@ -186,418 +211,318 @@
<input name="id" id="id" type="hidden" value="${project.id}" />
<input name="projectContributionProfitRateThreshold" id="projectContributionProfitRateThreshold" type="hidden" value="${Utils.format(project.projectContributionProfitRateThreshold)}" />
<!--验证表单元素（validate) begin-->
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>${project.deptName!}</span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目编号</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
- name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
- value="${project.projectNo!}" readonly />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
- name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" id="name"
- value="${project.name!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="type" name="type">
- <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
- <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
- <#-- <option value="3" <#if project.type=3>selected</#if>>战略合作类</option>-->
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="startDate"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>部门名称:</th>
+ <td class="table-title" colspan="2" ><input style="border-style:none;" readonly value="${project.deptName!}" /></td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目编号:</th>
+ <td class="table-title" colspan="2" ><input style="border-style:none;" readonly value="${project.projectNo!}" /></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目名称:</th>
+ <td class="table-title" colspan="5" >
+ <input type="text" id="name" style="border-style:none;" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
+ name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" value="${project.name!}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目类型:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="type" name="type" >
+ <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
+ <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划开始时间:</th>
+ <td class="table-title" colspan="1" >
+ <#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="startDate"
name="startDate" autocomplete="off"
value="${(project.startDate?string("yyyy-MM-dd"))!}" placeholder="项目计划开始时间"
- data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="endDate"
+ data-am-datepicker >
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划结束时间:</th>
+ <td class="table-title" colspan="1" >
+ <#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="endDate"
name="endDate" autocomplete="off"
value="${(project.endDate?string("yyyy-MM-dd"))!}" placeholder="项目计划结束时间"
- data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ data-am-datepicker >
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>垫资模式:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
+ <option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
+ <option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
+ <option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
+ <option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
+ </select>
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
- <option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
- <option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
- <option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
- <option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top" id="coop" <#if project.underwrittenMode! != 1>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合作对象</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入合作对象"
- name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
- value="${project.collaborator!}" />
- </div>
-
- <div class="am-form-file am-text-xs">
- <button type="button" class="am-btn am-btn-primary am-btn-sm">
- <i class="am-icon-cloud-upload"></i> 上传附件
- </button>
- <input id="file_upload_icon" type="file" name="files[]" >
- <span id="collaboratorUrl_span">${project.collaboratorUrl!}</span>
- <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
- </div>
- <!-- The global progress bar -->
- <div id="progress-area-icon" class="am-margin-top-sm am-hide">
- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>
- <div id="progress" class="am-progress am-progress-xs">
- <div class="am-progress-bar" style="width: 0%"></div>
- </div>
- </div>
- </div>
-
- <div class="am-g am-form-group am-margin-top" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资利息"
- name="advanceInterestAmount" placeholder="单位（元）" maxlength="16" id="advanceInterestAmount"
- value="${Utils.format(project.advanceInterestAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资峰值"
- name="advancePeakAmount" placeholder="单位（元）" maxlength="16" id="advancePeakAmount"
- value="${Utils.format(project.advancePeakAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
- name="contractAmount" placeholder="单位（元）" maxlength="20" id="contractAmount"
- value="${Utils.format(project.contractAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利"
- name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
- value="${Utils.format(project.grossProfit)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利率</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利率"
- name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
- value="${Utils.format(project.grossProfitMargin)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="请输入汇智产品金额"
- name="huizhiProductAmount" placeholder="单位（元）" maxlength="20" id="huizhiProductAmount"
- value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华智产品金额"
- name="huazhiProductAmount" placeholder="单位（元）" maxlength="20" id="huazhiProductAmount"
- value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合作对象:</th>
+ <td class="table-title" colspan="3" >
+ <div class="sameline">
+ <input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象"
+ name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
+ value="${project.collaborator!}" />
+ <span class="am-form-file am-text-xs spanline">
+ <button type="button" class="am-btn am-btn-primary am-btn-sm" style="border: none">
+ <i class="am-icon-cloud-upload"></i> 上传附件
+ </button>
+ <input id="file_upload_icon" type="file" name="files[]" >
+ <span style="display:none;" id="collaboratorUrl_span">${project.collaboratorUrl!}</span>
+ <span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span>
+ <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
+ </span>
+ <!-- The global progress bar -->
+ <#-- <span id="progress-area-icon" class="am-margin-top-sm am-hide">-->
+ <#-- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>-->
+ <#-- <div id="progress" class="am-progress am-progress-xs">-->
+ <#-- <div class="am-progress-bar" style="width: 0%"></div>-->
+ <#-- </div>-->
+ <#-- </span>-->
+ </div>
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华三产品金额"
- name="huasanProductAmount" placeholder="单位（元）" maxlength="20" id="huasanProductAmount"
- value="${Utils.format(project.huasanProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
- name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20" id="ziguangOtherAmount"
- value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目把握度</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="certainty" name="certainty">
- <#if project.certainty??>
- <option value="1" <#if project.certainty=1>selected</#if>>A：项目成功率80%-100%</option>
- <option value="2" <#if project.certainty=2>selected</#if>>B：项目成功率60%-80%</option>
- <option value="3" <#if project.certainty=3>selected</#if>>C：项目成功率40%-60%</option>
- <#else>
- <option value="1" >A：项目成功率40%-60%</option>
- <option value="2" >B：项目成功率40%-60%</option>
- <option value="3" >C：项目成功率40%-60%</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 200,searchBox: 1}" id="industryScene" name="industryScene">
- <#if project.industryScene??>
- <option value="1" <#if project.industryScene=1>selected</#if>>信息安全</option>
- <option value="2" <#if project.industryScene=2>selected</#if>>政府</option>
- <option value="3" <#if project.industryScene=3>selected</#if>>公安</option>
- <option value="4" <#if project.industryScene=4>selected</#if>>企业</option>
- <option value="5" <#if project.industryScene=5>selected</#if>>教育</option>
- <option value="6" <#if project.industryScene=6>selected</#if>>交通</option>
- <option value="7" <#if project.industryScene=7>selected</#if>>医疗</option>
- <option value="8" <#if project.industryScene=8>selected</#if>>电力资源</option>
- <option value="9" <#if project.industryScene=9>selected</#if>>运营商</option>
- <option value="10" <#if project.industryScene=10>selected</#if>>金融</option>
- <option value="11" <#if project.industryScene=11>selected</#if>>专网</option>
- <option value="12" <#if project.industryScene=12>selected</#if>>其他</option>
- <option value="13" <#if project.industryScene=13>selected</#if>>互联网</option>
- <option value="14" <#if project.industryScene=14>selected</#if>>银行</option>
- <#else>
- <option value="1" >信息安全</option>
- <option value="2" >政府</option>
- <option value="3" >公安</option>
- <option value="4" >企业</option>
- <option value="5" >教育</option>
- <option value="6" >交通</option>
- <option value="7" >医疗</option>
- <option value="8" >电力资源</option>
- <option value="9" >运营商</option>
- <option value="10" >金融</option>
- <option value="11" >专网</option>
- <option value="12" >其他</option>
- <option value="13" >互联网</option>
- <option value="14" >银行</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="resolvePlan" name="resolvePlan">
- <#if project.resolvePlan??>
- <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
- <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
- <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>
- <#else>
- <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
- <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
- <option value="3" >其他生态</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
- name="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000" id="customer"
- value="${project.customer!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>最终用户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
- name="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000" id="terminalCustomer"
- value="${project.terminalCustomer!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入价值及风险"
- placeholder="请输入价值及风险"
- >${project.valueRisk!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资利息:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资利息"
+ name="advanceInterestAmount" id="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.advanceInterestAmount)}" />
+ </td>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资峰值:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资峰值"
+ name="advancePeakAmount" id="advancePeakAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.advancePeakAmount)}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合同金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入合同金额"
+ name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.contractAmount)}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利"
+ name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.grossProfit)}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利率:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利率"
+ name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
+ value="${Utils.format(project.grossProfitMargin)}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>汇智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="汇智产品金额"
+ name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华智产品金额"
+ name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华三产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华三产品金额"
+ name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huasanProductAmount, "0.00")}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>其他产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="请输入其他产品金额"
+ name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目把握度:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="certainty" name="certainty">
+ <#if project.certainty??>
+ <option value="1" <#if project.certainty=1>selected</#if>>A：项目成功率80%-100%</option>
+ <option value="2" <#if project.certainty=2>selected</#if>>B：项目成功率60%-80%</option>
+ <option value="3" <#if project.certainty=3>selected</#if>>C：项目成功率40%-60%</option>
+ <#else>
+ <option value="1" >A：项目成功率40%-60%</option>
+ <option value="2" >B：项目成功率40%-60%</option>
+ <option value="3" >C：项目成功率40%-60%</option>
+ </#if>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>行业场景应用:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="industryScene" name="industryScene">
+ <#if project.industryScene??>
+ <option value="1" <#if project.industryScene=1>selected</#if>>信息安全</option>
+ <option value="2" <#if project.industryScene=2>selected</#if>>政府</option>
+ <option value="3" <#if project.industryScene=3>selected</#if>>公安</option>
+ <option value="4" <#if project.industryScene=4>selected</#if>>企业</option>
+ <option value="5" <#if project.industryScene=5>selected</#if>>教育</option>
+ <option value="6" <#if project.industryScene=6>selected</#if>>交通</option>
+ <option value="7" <#if project.industryScene=7>selected</#if>>医疗</option>
+ <option value="8" <#if project.industryScene=8>selected</#if>>电力资源</option>
+ <option value="9" <#if project.industryScene=9>selected</#if>>运营商</option>
+ <option value="10" <#if project.industryScene=10>selected</#if>>金融</option>
+ <option value="11" <#if project.industryScene=11>selected</#if>>专网</option>
+ <option value="12" <#if project.industryScene=12>selected</#if>>其他</option>
+ <option value="13" <#if project.industryScene=13>selected</#if>>互联网</option>
+ <option value="14" <#if project.industryScene=14>selected</#if>>银行</option>
+ <#else>
+ <option value="1" >信息安全</option>
+ <option value="2" >政府</option>
+ <option value="3" >公安</option>
+ <option value="4" >企业</option>
+ <option value="5" >教育</option>
+ <option value="6" >交通</option>
+ <option value="7" >医疗</option>
+ <option value="8" >电力资源</option>
+ <option value="9" >运营商</option>
+ <option value="10" >金融</option>
+ <option value="11" >专网</option>
+ <option value="12" >其他</option>
+ <option value="13" >互联网</option>
+ <option value="14" >银行</option>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目解决方案:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan">
+ <#if project.resolvePlan??>
+ <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
+ <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
+ <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>
+ <#else>
+ <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
+ <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
+ <option value="3" >其他生态</option>
+ </#if>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>客户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
+ name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
+ value="${project.customer!}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>最终用户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
+ name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
+ value="${project.terminalCustomer!}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>价值及风险:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险"
+ >${project.valueRisk!}</textarea>
+ </td>
+ </tr>
+ </table>
</div>
<!--验证表单元素（validate end-->
<div class="am-tab-panel am-fade am-in" id="tab2">
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目负责人</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"
- name="principal" placeholder="请输入项目负责人" maxlength="20"
- value="${project.principal!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">预计合同签订时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="contractTime"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）其他信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目负责人:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" id="principal" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目负责人"
+ name="principal" placeholder="请输入项目负责人" maxlength="20"
+ value="${project.principal!}" />
+ </td>
+ <th class="table-title" colspan="1" >预计合同签订时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="contractTime"
name="contractTime" autocomplete="off"
value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">项目计划招标时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="bidsTime"
+ </td>
+ <th class="table-title" colspan="1" >项目计划招标时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="bidsTime"
name="bidsTime" autocomplete="off"
value="${(project.bidsTime?string("yyyy-MM-dd"))!}" placeholder="项目计划招标时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">是否二次合作</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="isSecond" name="isSecond">
- <#if project.isSecond??>
- <option value="-1" ></option>
- <option value="1" <#if project.isSecond=1>selected</#if>>是</option>
- <option value="2" <#if project.isSecond=2>selected</#if>>否</option>
- <#else>
- <option value="-1" ></option>
- <option value="1" >是</option>
- <option value="2" >否</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">直签</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="signType" name="signType">
- <#if project.signType??>
- <option value="-1" ></option>
- <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
- <#else>
- <option value="-1" ></option>
- <option value="1" >紫光汇智直接投标</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同收款条款</div>
- <div class="am-u-sm-6 am-u-md-6">
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >是否二次合作:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="isSecond" name="isSecond">
+ <#if project.isSecond??>
+ <option value="-1" ></option>
+ <option value="1" <#if project.isSecond=1>selected</#if>>是</option>
+ <option value="2" <#if project.isSecond=2>selected</#if>>否</option>
+ <#else>
+ <option value="-1" ></option>
+ <option value="1" >是</option>
+ <option value="2" >否</option>
+ </#if>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" >直签:</th>
+ <td class="table-title" colspan="3" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
+ <#if project.signType??>
+ <option value="-1" ></option>
+ <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
+ <#else>
+ <option value="-1" ></option>
+ <option value="1" >紫光汇智直接投标</option>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同收款条款:</th>
+ <td class="table-title" colspan="5" >
<textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入收款条款"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款"
>${project.mainContractCollectionTerms!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同具体解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同具体解决方案:</th>
+ <td class="table-title" colspan="5" >
<textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入具体解决方案"
placeholder="请输入具体解决方案"
>${project.mainContractResolvePlan!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
- <div class="am-u-sm-6 am-u-md-6">
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >计收计划:</th>
+ <td class="table-title" colspan="5" >
<textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
>${project.calculationCollection!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </td>
+ </tr>
+ </table>
</div>
<div class="am-tab-panel am-fade am-in" id="tab3">
<div class="fixed-section">
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index deef13d..ec68109 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -1,6 +1,34 @@
<#assign base=request.contextPath />
<#import "../common/defaultLayout.ftl" as defaultLayout>
<@defaultLayout.layout>
+ <style type="text/css">
+ .table-title{
+ text-align: left;
+ }
+ input::-webkit-outer-spin-button,
+ input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ }
+ input[type="text"]{
+ -moz-appearance: textfield;
+ }
+ .am-table-striped>tbody>tr:nth-child(odd)>input[type="text"]{
+ background-color: #f9f9f9;
+ }
+ input[type="text"]:focus{
+ outline: none;
+ }
+ .table-inline {
+ /*width: 600px;*/
+ width: 100%;
+ border:0 none;
+ outline:none;
+ }
+ .sameline {
+ display: flex;
+ /*position: relative;*/
+ }
+ </style>
<div class="admin-content">
<div class="admin-content-body">
<div class="am-cf am-padding">
@@ -19,371 +47,281 @@
<#--<input name="permissionID" id="permissionID" type="hidden" value="${permissionID!}" />-->
<!--验证表单元素（validate) begin-->
<input name="id" id="id" type="hidden" value="${projectId}" />
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>${dept.name}</span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目编号</div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>保存后默认提供</span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="name" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
- name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
- <div class="am-u-sm-6 am-u-md-6" style="font-size: small">
- <select data-am-selected id="type" name="type" >
- <option value="1" >工程集成类</option>
- <option value="2" >设备集成类</option>
- <#-- <option value="3" >战略合作类</option>-->
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="startDate"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>部门名称:</th>
+ <td class="table-title" colspan="2" ><input class="table-inline" readonly value="${dept.name!}"/></td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目编号:</th>
+ <td class="table-title" colspan="2" ><input class="table-inline" readonly value="保存后默认提供"/></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目名称:</th>
+ <td class="table-title" colspan="5" >
+ <input type="text" id="name" style="border-style:none;" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
+ name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" value="" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目类型:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="type" name="type" >
+ <option value="1" >工程集成类</option>
+ <option value="2" >设备集成类</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划开始时间:</th>
+ <td class="table-title" colspan="1" >
+<#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="startDate"
name="startDate" autocomplete="off"
value="" placeholder="项目计划开始时间"
data-am-datepicker >
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="endDate"
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划结束时间:</th>
+ <td class="table-title" colspan="1" >
+<#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="endDate"
name="endDate" autocomplete="off"
value="" placeholder="项目计划结束时间"
data-am-datepicker >
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>垫资模式:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
+ <option value="1" >A类-不垫资（战略合作）</option>
+ <option value="2" >B类-不垫资（背靠背）</option>
+ <option value="3" >C类-垫资（账期覆盖）</option>
+ <option value="4" >D类-垫资（账期不覆盖）</option>
+ </select>
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
- <option value="1" >A类-不垫资（战略合作）</option>
- <option value="2" >B类-不垫资（背靠背）</option>
- <option value="3" >C类-垫资（账期覆盖）</option>
- <option value="4" >D类-垫资（账期不覆盖）</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合作对象:</th>
+ <td class="table-title" colspan="3" >
+ <div class="sameline">
+ <input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象"
+ name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
+ value="" />
+ <span class="am-form-file am-text-xs spanline">
+ <button type="button" class="am-btn am-btn-primary am-btn-sm" style="border: none">
+ <i class="am-icon-cloud-upload"></i> 上传附件
+ </button>
+ <input id="file_upload_icon" type="file" name="files[]" >
+ <span style="display:none;" id="collaboratorUrl_span"></span>
+ <span id="collaboratorUrl_check"></span>
+ <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value=""/>
+ </span>
+ <!-- The global progress bar -->
+<#-- <span id="progress-area-icon" class="am-margin-top-sm am-hide">-->
+<#-- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>-->
+<#-- <div id="progress" class="am-progress am-progress-xs">-->
+<#-- <div class="am-progress-bar" style="width: 0%"></div>-->
+<#-- </div>-->
+<#-- </span>-->
+ </div>
+ </td>
- <div class="am-g am-form-group am-margin-top" id="coop">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合作对象</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入合作对象"
- name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
- value="" />
- </div>
- <div class="am-form-file am-text-xs">
- <button type="button" class="am-btn am-btn-primary am-btn-sm">
- <i class="am-icon-cloud-upload"></i> 上传附件
- </button>
- <input id="file_upload_icon" type="file" name="files[]" >
- <span id="collaboratorUrl_span"></span>
- <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value=""/>
- </div>
- <!-- The global progress bar -->
- <div id="progress-area-icon" class="am-margin-top-sm am-hide">
- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>
- <div id="progress" class="am-progress am-progress-xs">
- <div class="am-progress-bar" style="width: 0%"></div>
- </div>
- </div>
- </div>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资利息:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资利息"
+ name="advanceInterestAmount" id="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
+ value="" />
+ </td>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资峰值:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资峰值"
+ name="advancePeakAmount" id="advancePeakAmount" placeholder="单位（元）" maxlength="16"
+ value="" />
+ </td>
- <div class="am-g am-form-group am-margin-top" id="noUnder1" hidden>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资利息"
- name="advanceInterestAmount" id="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top" id="noUnder2" hidden>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入垫资峰值"
- name="advancePeakAmount" id="advancePeakAmount" placeholder="单位（元）" maxlength="16"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
- name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利"
- name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利率</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利率"
- name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="汇智产品金额"
- name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华智产品金额"
- name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华三产品金额"
- name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
- name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目把握度</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="certainty" name="certainty">
- <option value="1" >A：项目成功率80%-100%</option>
- <option value="2" >B：项目成功率60%-80%</option>
- <option value="3" >C：项目成功率40%-60%</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 200,searchBox: 1}" id="industryScene" name="industryScene">
- <option value="1" >信息安全</option>
- <option value="2" >政府</option>
- <option value="3" >公安</option>
- <option value="4" >企业</option>
- <option value="5" >教育</option>
- <option value="6" >交通</option>
- <option value="7" >医疗</option>
- <option value="8" >电力资源</option>
- <option value="9" >运营商</option>
- <option value="10" >金融</option>
- <option value="11" >专网</option>
- <option value="12" >其他</option>
- <option value="13" >互联网</option>
- <option value="14" >银行</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="resolvePlan" name="resolvePlan">
- <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
- <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
- <option value="3" >其他生态</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
- name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>最终用户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
- name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入价值及风险"
- placeholder="请输入价值及风险"
- ></textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合同金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入合同金额"
+ name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
+ value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利"
+ name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
+ value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利率:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利率"
+ name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
+ value="" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>汇智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="汇智产品金额"
+ name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华智产品金额"
+ name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华三产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华三产品金额"
+ name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>其他产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="请输入其他产品金额"
+ name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目把握度:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="certainty" name="certainty">
+ <option value="1" >A：项目成功率80%-100%</option>
+ <option value="2" >B：项目成功率60%-80%</option>
+ <option value="3" >C：项目成功率40%-60%</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>行业场景应用:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="industryScene" name="industryScene">
+ <option value="1" >信息安全</option>
+ <option value="2" >政府</option>
+ <option value="3" >公安</option>
+ <option value="4" >企业</option>
+ <option value="5" >教育</option>
+ <option value="6" >交通</option>
+ <option value="7" >医疗</option>
+ <option value="8" >电力资源</option>
+ <option value="9" >运营商</option>
+ <option value="10" >金融</option>
+ <option value="11" >专网</option>
+ <option value="12" >其他</option>
+ <option value="13" >互联网</option>
+ <option value="14" >银行</option>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目解决方案:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan">
+ <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
+ <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
+ <option value="3" >其他生态</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>客户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
+ name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
+ value="" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>最终用户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
+ name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
+ value="" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>价值及风险:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险"
+ ></textarea>
+ </td>
+ </tr>
+ </table>
</div>
<!--验证表单元素（validate end-->
</div>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab2">
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目负责人</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"
- name="principal" placeholder="请输入项目负责人" maxlength="20"
- value="" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">预计合同签订时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="contractTime"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）其他信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目负责人:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" id="principal" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目负责人"
+ name="principal" placeholder="请输入项目负责人" maxlength="20"
+ value="" />
+ </td>
+ <th class="table-title" colspan="1" >预计合同签订时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="contractTime"
name="contractTime" autocomplete="off"
value="" placeholder="预计合同签订时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">项目计划招标时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="bidsTime"
+ </td>
+ <th class="table-title" colspan="1" >项目计划招标时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="bidsTime"
name="bidsTime" autocomplete="off"
value="" placeholder="项目计划招标时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">是否二次合作</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="isSecond" name="isSecond">
- <option value="-1" ></option>
- <option value="1" >是</option>
- <option value="2" >否</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">直签</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="signType" name="signType">
- <option value="-1" ></option>
- <option value="1" >是</option>
- <option value="2" >否</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同收款条款</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入收款条款"
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >是否二次合作:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="isSecond" name="isSecond">
+ <option value="-1" ></option>
+ <option value="1" >是</option>
+ <option value="2" >否</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" >直签:</th>
+ <td class="table-title" colspan="3" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
+ <option value="-1" ></option>
+ <option value="1" >紫光汇智直接投标</option>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同收款条款:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入收款条款"
placeholder="请输入收款条款"
- ></textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同具体解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
- placeholder="请输入具体解决方案"
- ></textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
+ ></textarea>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同具体解决方案:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入具体解决方案"
+ placeholder="请输入具体解决方案"
+ ></textarea>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >计收计划:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
- ></textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ ></textarea>
+ </td>
+ </tr>
+ </table>
<#-- <div class="am-tabs-bd">-->
<#-- <div class="am-tab-panel am-fade am-in" id="tab2">-->
<#-- <span class="am-text-lg">收入</span>-->
@@ -1055,6 +993,7 @@
//设置服务器返回的url
$("#collaboratorUrl").val(data.result.data.url);
$("#collaboratorUrl_span").text(data.result.data.url);
+ $("#collaboratorUrl_check").text("已上传");
// console.log("collboratorUrl: " + $("#collaboratorUrl").val());
setTimeout(function () {
progressArea.addClass("am-hide");
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 616ee47..250b8f9 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -7,7 +7,32 @@
.select-hide .am-selected-content{
display: none;
}
-
+ .table-title{
+ text-align: left;
+ }
+ input::-webkit-outer-spin-button,
+ input::-webkit-inner-spin-button {
+ -webkit-appearance: none;
+ }
+ input[type="text"]{
+ -moz-appearance: textfield;
+ }
+ .am-table-striped>tbody>tr:nth-child(odd)>input[type="text"]{
+ background-color: #f9f9f9;
+ }
+ input[type="text"]:focus{
+ outline: none;
+ }
+ .table-inline {
+ /*width: 600px;*/
+ width: 100%;
+ border:0 none;
+ outline:none;
+ }
+ .sameline {
+ display: flex;
+ /*position: relative;*/
+ }
</style>
<div class="admin-content">
<div class="admin-content-body">
@@ -26,206 +51,146 @@
<div class="am-tab-panel am-fade am-in am-active" id="tab1">
<input name="id" id="id" type="hidden" value="${project.id}" />
<!--验证表单元素（validate) begin-->
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>部门名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <span>${project.deptName!}</span>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目编号</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="projectNo" class="am-input" data-validate-async data-validation-message="请输入项目编号（50字符以内）"
- name="projectNo" placeholder="请输入项目编号（50字符以内）" maxlength="50"
- value="${project.projectNo!}" readonly />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
- name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" id="name"
- value="${project.name!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="type" name="type">
- <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
- <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
-<#-- <option value="3" <#if project.type=3>selected</#if>>战略合作类</option>-->
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划开始时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="startDate"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）基本信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>部门名称:</th>
+ <td class="table-title" colspan="2" ><input class="table-inline" readonly value="${project.deptName!}" /></td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目编号:</th>
+ <td class="table-title" colspan="2" ><input class="table-inline" readonly value="${project.projectNo!}" /></td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目名称:</th>
+ <td class="table-title" colspan="5" >
+ <input type="text" id="name" style="border-style:none;" data-validate-async data-validation-message="请输入项目名称（1000字符以内）"
+ name="name" placeholder="请输入项目名称（1000字符以内）" maxlength="1000" value="${project.name!}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目类型:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="type" name="type" >
+ <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
+ <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划开始时间:</th>
+ <td class="table-title" colspan="1" >
+ <#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="startDate"
name="startDate" autocomplete="off"
value="${(project.startDate?string("yyyy-MM-dd"))!}" placeholder="项目计划开始时间"
- data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目计划结束时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="endDate"
+ data-am-datepicker >
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目计划结束时间:</th>
+ <td class="table-title" colspan="1" >
+ <#-- <i class="am-icon-calendar"></i>-->
+ <input type="text" style="border-style:none;" id="endDate"
name="endDate" autocomplete="off"
value="${(project.endDate?string("yyyy-MM-dd"))!}" placeholder="项目计划结束时间"
- data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ data-am-datepicker >
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>垫资模式:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
+ <option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
+ <option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
+ <option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
+ <option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
+ </select>
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
- <option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
- <option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
- <option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
- <option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top" id="coop" <#if project.underwrittenMode! != 1>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合作对象</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入合作对象"
- name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
- value="${project.collaborator!}" />
- </div>
-
- <div class="am-form-file am-text-xs">
- <button type="button" class="am-btn am-btn-primary am-btn-sm">
- <i class="am-icon-cloud-upload"></i> 上传附件
- </button>
- <input id="file_upload_icon" type="file" name="files[]" >
- <span id="collaboratorUrl_span">${project.collaboratorUrl!}</span>
- <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
- </div>
- <!-- The global progress bar -->
- <div id="progress-area-icon" class="am-margin-top-sm am-hide">
- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>
- <div id="progress" class="am-progress am-progress-xs">
- <div class="am-progress-bar" style="width: 0%"></div>
- </div>
- </div>
- </div>
-
- <div class="am-g am-form-group am-margin-top" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资利息"
- name="advanceInterestAmount" placeholder="单位（元）" maxlength="16" id="advanceInterestAmount"
- value="${Utils.format(project.advanceInterestAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input number" data-validate-async data-validation-message="请输入垫资峰值"
- name="advancePeakAmount" placeholder="单位（元）" maxlength="16" id="advancePeakAmount"
- value="${Utils.format(project.advancePeakAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
- name="contractAmount" placeholder="单位（元）" maxlength="20" id="contractAmount"
- value="${Utils.format(project.contractAmount)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利"
- name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
- value="${Utils.format(project.grossProfit)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目毛利率</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validate-async data-validation-message="请输入项目毛利率"
- name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
- value="${Utils.format(project.grossProfitMargin)}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>汇智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="请输入汇智产品金额"
- name="huizhiProductAmount" placeholder="单位（元）" maxlength="20" id="huizhiProductAmount"
- value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华智产品金额"
- name="huazhiProductAmount" placeholder="单位（元）" maxlength="20" id="huazhiProductAmount"
- value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合作对象:</th>
+ <td class="table-title" colspan="3" >
+ <div class="sameline">
+ <input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象"
+ name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
+ value="${project.collaborator!}" />
+ <span class="am-form-file am-text-xs spanline">
+ <button type="button" class="am-btn am-btn-primary am-btn-sm" style="border: none">
+ <i class="am-icon-cloud-upload"></i> 上传附件
+ </button>
+ <input id="file_upload_icon" type="file" name="files[]" >
+ <span style="display:none;" id="collaboratorUrl_span">${project.collaboratorUrl!}</span>
+ <span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span>
+ <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
+ </span>
+ <!-- The global progress bar -->
+ <#-- <span id="progress-area-icon" class="am-margin-top-sm am-hide">-->
+ <#-- <div id="progress-text-icon" class="am-text-xs am-text-right"></div>-->
+ <#-- <div id="progress" class="am-progress am-progress-xs">-->
+ <#-- <div class="am-progress-bar" style="width: 0%"></div>-->
+ <#-- </div>-->
+ <#-- </span>-->
+ </div>
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华三产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="华三产品金额"
- name="huasanProductAmount" placeholder="单位（元）" maxlength="20" id="huasanProductAmount"
- value="${Utils.format(project.huasanProductAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资利息:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资利息"
+ name="advanceInterestAmount" id="advanceInterestAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.advanceInterestAmount)}" />
+ </td>
+ <th class="table-title" colspan="1" hidden><span style="color: red;">*</span>垫资峰值:</th>
+ <td class="table-title" colspan="1" hidden>
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入垫资峰值"
+ name="advancePeakAmount" id="advancePeakAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.advancePeakAmount)}" />
+ </td>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>其他产品金额</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
- name="ziguangOtherAmount" placeholder="单位（元）" maxlength="20" id="ziguangOtherAmount"
- value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目把握度</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="certainty" name="certainty">
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>合同金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入合同金额"
+ name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.contractAmount)}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利"
+ name="grossProfit" id="grossProfit" placeholder="单位（元）" maxlength="16"
+ value="${Utils.format(project.grossProfit)}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目毛利率:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利率"
+ name="grossProfitMargin" id="grossProfitMargin" placeholder="单位（%）" maxlength="16"
+ value="${Utils.format(project.grossProfitMargin)}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>汇智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="汇智产品金额"
+ name="huizhiProductAmount" id="huizhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huizhiProductAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华智产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华智产品金额"
+ name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>华三产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="华三产品金额"
+ name="huasanProductAmount" id="huasanProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huasanProductAmount, "0.00")}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>其他产品金额:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="number am-input" style="border-style:none;" data-validation-message="请输入其他产品金额"
+ name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目把握度:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="certainty" name="certainty">
<#if project.certainty??>
<option value="1" <#if project.certainty=1>selected</#if>>A：项目成功率80%-100%</option>
<option value="2" <#if project.certainty=2>selected</#if>>B：项目成功率60%-80%</option>
@@ -235,15 +200,11 @@
<option value="2" >B：项目成功率40%-60%</option>
<option value="3" >C：项目成功率40%-60%</option>
</#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 200,searchBox: 1}" id="industryScene" name="industryScene">
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>行业场景应用:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="industryScene" name="industryScene">
<#if project.industryScene??>
<option value="1" <#if project.industryScene=1>selected</#if>>信息安全</option>
<option value="2" <#if project.industryScene=2>selected</#if>>政府</option>
@@ -275,60 +236,47 @@
<option value="13" >互联网</option>
<option value="14" >银行</option>
</#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="resolvePlan" name="resolvePlan">
- <#if project.resolvePlan??>
- <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
- <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
- <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>
- <#else>
- <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
- <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
- <option value="3" >其他生态</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
- name="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000" id="customer"
- value="${project.customer!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>最终用户名称</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" class="am-input" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
- name="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000" id="terminalCustomer"
- value="${project.terminalCustomer!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>价值及风险</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入价值及风险"
- placeholder="请输入价值及风险"
- >${project.valueRisk!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目解决方案:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan">
+ <#if project.resolvePlan??>
+ <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
+ <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>
+ <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>
+ <#else>
+ <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>
+ <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>
+ <option value="3" >其他生态</option>
+ </#if>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>客户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入客户名称（1000字符以内）"
+ name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
+ value="${project.customer!}" />
+ </td>
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>最终用户名称:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）"
+ name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
+ value="${project.terminalCustomer!}" />
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>价值及风险:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="5" cols="20" id="valueRisk" name="valueRisk" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入价值及风险"
+ placeholder="请输入价值及风险"
+ >${project.valueRisk!}</textarea>
+ </td>
+ </tr>
+ </table>
</div>
<!--验证表单元素（validate end-->
@@ -336,111 +284,89 @@
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in" id="tab2">
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目负责人</div>
- <div class="am-u-sm-6 am-u-md-6">
- <input type="text" id="principal" class="am-input" data-validate-async data-validation-message="请输入项目负责人"
- name="principal" placeholder="请输入项目负责人" maxlength="20"
- value="${project.principal!}" />
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">预计合同签订时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="contractTime"
+ <table id="myTable" class="am-table am-table-bordered">
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="6" style="text-align: center">项目立项（概算）其他信息</th>
+ <input type="hidden" style="border-style:none;" name="id" id="id" value="${id!}"/>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" ><span style="color: red;">*</span>项目负责人:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" id="principal" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目负责人"
+ name="principal" placeholder="请输入项目负责人" maxlength="20"
+ value="${project.principal!}" />
+ </td>
+ <th class="table-title" colspan="1" >预计合同签订时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="contractTime"
name="contractTime" autocomplete="off"
value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">项目计划招标时间</div>
- <div class="am-u-sm-2 am-u-md-2">
- <div class="am-form-group am-form-icon">
- <i class="am-icon-calendar"></i>
- <input type="text" class="am-form-field am-input-sm" id="bidsTime"
+ </td>
+ <th class="table-title" colspan="1" >项目计划招标时间:</th>
+ <td class="table-title" colspan="1" >
+ <input type="text" class="am-form-field am-input-sm" style="border-style:none;" id="bidsTime"
name="bidsTime" autocomplete="off"
value="${(project.bidsTime?string("yyyy-MM-dd"))!}" placeholder="项目计划招标时间"
data-am-datepicker>
- </div>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">是否二次合作</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="isSecond" name="isSecond">
- <#if project.isSecond??>
- <option value="-1" ></option>
- <option value="1" <#if project.isSecond=1>selected</#if>>是</option>
- <option value="2" <#if project.isSecond=2>selected</#if>>否</option>
- <#else>
- <option value="-1" ></option>
- <option value="1" >是</option>
- <option value="2" >否</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">直签</div>
- <div class="am-u-sm-6 am-u-md-6">
- <select data-am-selected id="signType" name="signType">
- <#if project.signType??>
- <option value="-1" ></option>
- <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
- <#else>
- <option value="-1" ></option>
- <option value="1" >紫光汇智直接投标</option>
- </#if>
- </select>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同收款条款</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入收款条款"
- placeholder="请输入收款条款"
- >${project.mainContractCollectionTerms!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">主合同具体解决方案</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="请输入具体解决方案"
- placeholder="请输入具体解决方案"
- >${project.mainContractResolvePlan!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
-
- <div class="am-g am-form-group am-margin-top">
- <div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
- <div class="am-u-sm-6 am-u-md-6">
- <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
- class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
- placeholder="按照开票金额及时间罗列计收计划"
- >${project.calculationCollection!}</textarea>
- </div>
- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
- </div>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >是否二次合作:</th>
+ <td class="table-title" colspan="1" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="isSecond" name="isSecond">
+ <#if project.isSecond??>
+ <option value="-1" ></option>
+ <option value="1" <#if project.isSecond=1>selected</#if>>是</option>
+ <option value="2" <#if project.isSecond=2>selected</#if>>否</option>
+ <#else>
+ <option value="-1" ></option>
+ <option value="1" >是</option>
+ <option value="2" >否</option>
+ </#if>
+ </select>
+ </td>
+ <th class="table-title" colspan="1" >直签:</th>
+ <td class="table-title" colspan="3" >
+ <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
+ <#if project.signType??>
+ <option value="-1" ></option>
+ <option value="1" <#if project.signType=1>selected</#if>>紫光汇智直接投标</option>
+ <#else>
+ <option value="-1" ></option>
+ <option value="1" >紫光汇智直接投标</option>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同收款条款:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入收款条款"
+ placeholder="请输入收款条款"
+ >${project.mainContractCollectionTerms!}</textarea>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >主合同具体解决方案:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="mainContractResolvePlan" name="mainContractResolvePlan" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入具体解决方案"
+ placeholder="请输入具体解决方案"
+ >${project.mainContractResolvePlan!}</textarea>
+ </td>
+ </tr>
+ <tr class="am-text-nowrap">
+ <th class="table-title" colspan="1" >计收计划:</th>
+ <td class="table-title" colspan="5" >
+ <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
+ class="am-input" style="border-style:none;" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
+ placeholder="按照开票金额及时间罗列计收计划"
+ >${project.calculationCollection!}</textarea>
+ </td>
+ </tr>
+ </table>
</div>
</div>
<#-- <div class="am-tabs-bd">-->