mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分割垫资模式和合作类型

master
OathK1per 2022-11-08 17:49:14 +08:00
parent f51ccac3f2
commit 0f1e526fc3
9 changed files with 233 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/cn/palmte/work/bean/CooperateTypeEnum.java 100644
View File

@ -0,0 +1,44 @@
package cn.palmte.work.bean;
/**
* @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257
*/
public enum CooperateTypeEnum {
PLAN_O(-1,""),
PLAN_A(1,"战略合作类"),
PLAN_B(2,"非战略合作类");
private int cooperateType;
private String cooperateTypeStr;
private CooperateTypeEnum(int cooperateType, String cooperateTypeStr) {
this.cooperateType = cooperateType;
this.cooperateTypeStr = cooperateTypeStr;
}
public int getCooperateType() {
return cooperateType;
}
public void setCooperateType(int cooperateType) {
this.cooperateType = cooperateType;
}
public String getCooperateTypeStr() {
return cooperateTypeStr;
}
public void setCooperateTypeStr(String cooperateTypeStr) {
this.cooperateTypeStr = cooperateTypeStr;
}
public static CooperateTypeEnum parseCooperateType(int cooperateType){
if(cooperateType == 1){
return PLAN_A;
}
if(cooperateType == 2){
return PLAN_B;
}
throw new IllegalArgumentException("Unkown cooperateType:"+cooperateType);
}
}

22
src/main/java/cn/palmte/work/model/Project.java
View File

@ -200,6 +200,12 @@ public class Project {
@Column(name = "underwritten_mode_str") @Column(name = "underwritten_mode_str")
private String underwrittenModeStr; private String underwrittenModeStr;
@Column(name = "cooperate_type")
private Integer cooperateType;
@Column(name = "cooperate_type_str")
private String cooperateTypeStr;
@Column(name = "certainty") @Column(name = "certainty")
private Integer certainty; private Integer certainty;
@ -645,6 +651,22 @@ public class Project {
this.underwrittenModeStr = underwrittenModeStr; this.underwrittenModeStr = underwrittenModeStr;
} }
public Integer getCooperateType() {
return cooperateType;
}
public void setCooperateType(Integer cooperateType) {
this.cooperateType = cooperateType;
}
public String getCooperateTypeStr() {
return cooperateTypeStr;
}
public void setCooperateTypeStr(String cooperateTypeStr) {
this.cooperateTypeStr = cooperateTypeStr;
}
public Integer getCertainty() { public Integer getCertainty() {
return certainty; return certainty;
} }

9
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -256,7 +256,7 @@ public class ProjectService {
public Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) { public Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) {
String projectNo = numSeqService.generate(); String projectNo = numSeqService.generate();
if (project.getUnderwrittenMode() != 1) { if (project.getCooperateType() != 1) {
project.setCollaborator(null); project.setCollaborator(null);
project.setCollaboratorUrl(null); project.setCollaboratorUrl(null);
} }
@ -267,6 +267,7 @@ public class ProjectService {
project.setProjectNo(projectNo); project.setProjectNo(projectNo);
project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
project.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); project.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr());
project.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr());
project.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); project.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr());
project.setIsSecondStr(IsSecondEnum.parseIsSecond(project.getIsSecond()).getIsSecondStr()); project.setIsSecondStr(IsSecondEnum.parseIsSecond(project.getIsSecond()).getIsSecondStr());
project.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr()); project.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr());
@ -309,6 +310,8 @@ public class ProjectService {
projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); projectInDb.setUnderwrittenMode(project.getUnderwrittenMode());
projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr());
projectInDb.setCooperateType(project.getCooperateType());
projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr());
projectInDb.setCertainty(project.getCertainty()); projectInDb.setCertainty(project.getCertainty());
projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr());
projectInDb.setIsSecond(project.getIsSecond()); projectInDb.setIsSecond(project.getIsSecond());
@ -318,7 +321,7 @@ public class ProjectService {
projectInDb.setResolvePlan(project.getResolvePlan()); projectInDb.setResolvePlan(project.getResolvePlan());
projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr());
if (project.getUnderwrittenMode() != 1) { if (project.getCooperateType() != 1) {
projectInDb.setCollaborator(null); projectInDb.setCollaborator(null);
projectInDb.setCollaboratorUrl(null); projectInDb.setCollaboratorUrl(null);
} else { } else {
@ -371,6 +374,8 @@ public class ProjectService {
projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); projectInDb.setUnderwrittenMode(project.getUnderwrittenMode());
projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr());
projectInDb.setCooperateType(project.getCooperateType());
projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr());
projectInDb.setCertainty(project.getCertainty()); projectInDb.setCertainty(project.getCertainty());
projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr());
// projectInDb.setIsSecond(project.getIsSecond()); // projectInDb.setIsSecond(project.getIsSecond());

2
src/main/resources/static/assets/css/admin.css
View File

@ -33,7 +33,7 @@ ul {
height: 100%; height: 100%;
width: 200px; width: 200px;
vertical-align:middle; vertical-align:middle;
background: url(../.././img/logo.png) no-repeat left center; background: url(../../img/logo.png) no-repeat left center;
-webkit-background-size: 125px 24px; -webkit-background-size: 125px 24px;
background-size: 125px 24px; background-size: 125px 24px;
} }

BIN
src/main/resources/static/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 82 KiB

38
src/main/resources/templates/admin/project_approve.ftl
View File

@ -222,22 +222,40 @@
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" <#if project.underwrittenMode! == 2> colspan="5" <#else> colspan="1" </#if> > <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if> >
<#if project.underwrittenMode??> <#if project.underwrittenMode??>
<#if (project.underwrittenMode) =1> <#if (project.underwrittenMode) =1>
<input readonly value="A类-不垫资（战略合作）"/> <input readonly value="A类-不垫资"/>
<#elseif (project.underwrittenMode) =2>
<input readonly value="B类-不垫资（背靠背）"/>
<#elseif (project.underwrittenMode) =3> <#elseif (project.underwrittenMode) =3>
<input readonly value="C类-垫资（账期覆盖）"/> <input readonly value="B类-垫资（账期覆盖）"/>
<#elseif (project.underwrittenMode) =4> <#elseif (project.underwrittenMode) =4>
<input readonly value="D类-垫资（账期不覆盖）"/> <input readonly value="C类-垫资（账期不覆盖）"/>
</#if> </#if>
<#else> <#else>
<input readonly value=""/> <input readonly value=""/>
</#if> </#if>
</td> </td>
<#if project.underwrittenMode! == 1> <#if project.underwrittenMode! gt 2>
<th class="table-title" colspan="1" ><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.advanceInterestAmount)}元" /></td>
<th class="table-title" colspan="1" ><span style="font-size: 15px">垫资峰值:</span></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" ><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" <#if project.cooperateType! == 1> colspan="1" <#else> colspan="5" </#if> >
<#if project.cooperateType??>
<#if (project.cooperateType) =1>
<input readonly value="战略合作类"/>
<#elseif (project.cooperateType) =2>
<input readonly value="非战略合作类"/>
</#if>
<#else>
<input readonly value=""/>
</#if>
</td>
<#if project.cooperateType! == 1>
<th class="table-title" colspan="1" ><span style="font-size: 15px">合作对象:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">合作对象:</span></th>
<td class="table-title" colspan="3" ><input readonly value="${project.collaborator!}"/> <td class="table-title" colspan="3" ><input readonly value="${project.collaborator!}"/>
<#if project.collaboratorUrl?? && project.collaboratorUrl != ""> <#if project.collaboratorUrl?? && project.collaboratorUrl != "">
@ -251,12 +269,6 @@
</#if> </#if>
</td> </td>
</#if> </#if>
<#if project.underwrittenMode! gt 2>
<th class="table-title" colspan="1" ><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.advanceInterestAmount)}元" /></td>
<th class="table-title" colspan="1" ><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" ><input readonly value="${Utils.format(project.advancePeakAmount)}元" /></td>
</#if>
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">合同金额:</span></th> <th class="table-title" colspan="1" ><span style="font-size: 15px">合同金额:</span></th>

79
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -143,15 +143,37 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()"> <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="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>>B类-垫资（账期覆盖）</option>
<option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option> <option value="4" <#if project.underwrittenMode=4>selected</#if>>C类-垫资（账期不覆盖）</option>
<option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
</select> </select>
</td> </td>
<th class="table-title" colspan="1" id="coop1" <#if project.underwrittenMode! != 1>hidden</#if> ><span style="color: red;">*</span><span style="font-size: 15px">合作对象:</span></th> <th class="table-title" colspan="1" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="3" id="coop2" <#if project.underwrittenMode! != 1>hidden</#if> > <td class="table-title" colspan="1" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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" id="noUnder3" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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><span style="font-size: 15px">合作类型:</span></th>
<td class="table-title" colspan="1" id="spanMode" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="cooperateType" name="cooperateType" onchange="changeCheck2()">
<option value="1" <#if project.cooperateType=1>selected</#if>>战略合作类</option>
<option value="2" <#if project.cooperateType=2>selected</#if>>非战略合作类</option>
</select>
</td>
<th class="table-title" colspan="1" id="coop1" <#if project.cooperateType! != 1>hidden</#if> ><span style="color: red;">*</span><span style="font-size: 15px">合作对象:</span></th>
<td class="table-title" colspan="3" id="coop2" <#if project.cooperateType! != 1>hidden</#if> >
<div class="sameline"> <div class="sameline">
<input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象" <input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象"
name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20" name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
@ -165,30 +187,9 @@
<span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span> <span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span>
<input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/> <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
</span> </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> </div>
</td> </td>
<th class="table-title" colspan="1" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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" id="noUnder3" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th>
@ -1175,23 +1176,12 @@
<script> <script>
var changeCheck = function () { var changeCheck = function () {
var underwrittenMode = $("#underwrittenMode").val(); var underwrittenMode = $("#underwrittenMode").val();
if (underwrittenMode == 1) { if (underwrittenMode <= 2) {
$("#coop1").show();
$("#coop2").show();
$("#noUnder1").hide();
$("#noUnder2").hide();
$("#noUnder3").hide();
$("#noUnder4").hide();
} else if (underwrittenMode == 2) {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").hide(); $("#noUnder1").hide();
$("#noUnder2").hide(); $("#noUnder2").hide();
$("#noUnder3").hide(); $("#noUnder3").hide();
$("#noUnder4").hide(); $("#noUnder4").hide();
} else { } else {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").show(); $("#noUnder1").show();
$("#noUnder2").show(); $("#noUnder2").show();
$("#noUnder3").show(); $("#noUnder3").show();
@ -1199,6 +1189,17 @@
} }
}; };
var changeCheck2 = function () {
var cooperateType = $("#cooperateType").val();
if (cooperateType == 1) {
$("#coop1").show();
$("#coop2").show();
} else {
$("#coop1").hide();
$("#coop2").hide();
}
};
function ajaxUploadFile(id, url) { function ajaxUploadFile(id, url) {
// if($('#modal')){ // if($('#modal')){
// $('#modal').modal('open'); // $('#modal').modal('open');

79
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -94,10 +94,33 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" id="spanMode" > <td class="table-title" colspan="1" id="spanMode" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()">
<option value="1" >A类-不垫资（战略合作）</option> <option value="1" >A类-不垫资</option>
<option value="2" >B类-不垫资（背靠背）</option> <option value="3" >B类-垫资（账期覆盖）</option>
<option value="3" >C类-垫资（账期覆盖）</option> <option value="4" >C类-垫资（账期不覆盖）</option>
<option value="4" >D类-垫资（账期不覆盖）</option> </select>
</td>
<th class="table-title" colspan="1" id="noUnder1" hidden><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" id="noUnder2" 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" id="noUnder3" hidden><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" 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>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合作类型:</span></th>
<td class="table-title" colspan="1" id="spanMode" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="cooperateType" name="cooperateType" onchange="changeCheck2()">
<option value="1" >战略合作类</option>
<option value="2" >非战略合作类</option>
</select> </select>
</td> </td>
@ -116,30 +139,9 @@
<span id="collaboratorUrl_check"></span> <span id="collaboratorUrl_check"></span>
<input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value=""/> <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value=""/>
</span> </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> </div>
</td> </td>
<th class="table-title" colspan="1" id="noUnder1" hidden><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" id="noUnder2" 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" id="noUnder3" hidden><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" 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>
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th>
@ -591,23 +593,12 @@
var changeCheck = function () { var changeCheck = function () {
var underwrittenMode = $("#underwrittenMode").val(); var underwrittenMode = $("#underwrittenMode").val();
if (underwrittenMode == 1) { if (underwrittenMode <= 2) {
$("#coop1").show();
$("#coop2").show();
$("#noUnder1").hide();
$("#noUnder2").hide();
$("#noUnder3").hide();
$("#noUnder4").hide();
} else if (underwrittenMode == 2) {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").hide(); $("#noUnder1").hide();
$("#noUnder2").hide(); $("#noUnder2").hide();
$("#noUnder3").hide(); $("#noUnder3").hide();
$("#noUnder4").hide(); $("#noUnder4").hide();
} else { } else {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").show(); $("#noUnder1").show();
$("#noUnder2").show(); $("#noUnder2").show();
$("#noUnder3").show(); $("#noUnder3").show();
@ -615,6 +606,17 @@
} }
}; };
var changeCheck2 = function () {
var cooperateType = $("#cooperateType").val();
if (cooperateType == 1) {
$("#coop1").show();
$("#coop2").show();
} else {
$("#coop1").hide();
$("#coop2").hide();
}
};
$(function () { $(function () {
generateFileupload1('icon'); generateFileupload1('icon');
@ -659,6 +661,7 @@
var startTime = $("#startDate").val(); var startTime = $("#startDate").val();
var endTime = $("#endDate").val(); var endTime = $("#endDate").val();
var underwrittenMode = $("#underwrittenMode").val(); var underwrittenMode = $("#underwrittenMode").val();
var cooperateType = $("#cooperateType").val();
var collaborator = $("#collaborator").val(); var collaborator = $("#collaborator").val();
var advanceInterestAmount = $("#advanceInterestAmount").val(); var advanceInterestAmount = $("#advanceInterestAmount").val();
var advancePeakAmount = $("#advancePeakAmount").val(); var advancePeakAmount = $("#advancePeakAmount").val();
@ -745,7 +748,7 @@
// return; // return;
// } // }
if (underwrittenMode == 1 && (collaborator == undefined || collaborator.length <= 0 )) { if (cooperateType == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空'); window.confirm('合作对象不能为空');
check = 1; check = 1;
return; return;

79
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -98,15 +98,37 @@
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">垫资模式:</span></th>
<td class="table-title" colspan="1" > <td class="table-title" colspan="1" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="underwrittenMode" name="underwrittenMode" onchange="changeCheck()"> <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="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>>B类-垫资（账期覆盖）</option>
<option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option> <option value="4" <#if project.underwrittenMode=4>selected</#if>>C类-垫资（账期不覆盖）</option>
<option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
</select> </select>
</td> </td>
<th class="table-title" colspan="1" id="coop1" <#if project.underwrittenMode! != 1>hidden</#if> ><span style="color: red;">*</span><span style="font-size: 15px">合作对象:</span></th> <th class="table-title" colspan="1" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="3" id="coop2" <#if project.underwrittenMode! != 1>hidden</#if> > <td class="table-title" colspan="1" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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" id="noUnder3" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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><span style="font-size: 15px">合作类型:</span></th>
<td class="table-title" colspan="1" id="spanMode" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="cooperateType" name="cooperateType" onchange="changeCheck2()">
<option value="1" <#if project.cooperateType=1>selected</#if>>战略合作类</option>
<option value="2" <#if project.cooperateType=2>selected</#if>>非战略合作类</option>
</select>
</td>
<th class="table-title" colspan="1" id="coop1" <#if project.cooperateType! != 1>hidden</#if> ><span style="color: red;">*</span><span style="font-size: 15px">合作对象:</span></th>
<td class="table-title" colspan="3" id="coop2" <#if project.cooperateType! != 1>hidden</#if> >
<div class="sameline"> <div class="sameline">
<input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象" <input type="text" style="border-style:none;width: 50%;" data-validate-async data-validation-message="请输入合作对象"
name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20" name="collaborator" id="collaborator" placeholder="请输入合作对象" maxlength="20"
@ -120,30 +142,9 @@
<span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span> <span id="collaboratorUrl_check"><#if project.collaboratorUrl??>已上传</#if></span>
<input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/> <input id="collaboratorUrl" name="collaboratorUrl" type="hidden" value="${project.collaboratorUrl!}"/>
</span> </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> </div>
</td> </td>
<th class="table-title" colspan="1" id="noUnder1" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资利息:</span></th>
<td class="table-title" colspan="1" id="noUnder2" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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" id="noUnder3" <#if project.underwrittenMode! <= 2>hidden</#if>><span style="color: red;">*</span><span style="font-size: 15px">垫资峰值:</span></th>
<td class="table-title" colspan="1" id="noUnder4" <#if project.underwrittenMode! <= 2>hidden</#if>>
<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>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th> <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th>
@ -635,23 +636,12 @@
var changeCheck = function () { var changeCheck = function () {
var underwrittenMode = $("#underwrittenMode").val(); var underwrittenMode = $("#underwrittenMode").val();
if (underwrittenMode == 1) { if (underwrittenMode <= 2) {
$("#coop1").show();
$("#coop2").show();
$("#noUnder1").hide();
$("#noUnder2").hide();
$("#noUnder3").hide();
$("#noUnder4").hide();
} else if (underwrittenMode == 2) {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").hide(); $("#noUnder1").hide();
$("#noUnder2").hide(); $("#noUnder2").hide();
$("#noUnder3").hide(); $("#noUnder3").hide();
$("#noUnder4").hide(); $("#noUnder4").hide();
} else { } else {
$("#coop1").hide();
$("#coop2").hide();
$("#noUnder1").show(); $("#noUnder1").show();
$("#noUnder2").show(); $("#noUnder2").show();
$("#noUnder3").show(); $("#noUnder3").show();
@ -659,6 +649,17 @@
} }
}; };
var changeCheck2 = function () {
var cooperateType = $("#cooperateType").val();
if (cooperateType == 1) {
$("#coop1").show();
$("#coop2").show();
} else {
$("#coop1").hide();
$("#coop2").hide();
}
};
$(function () { $(function () {
generateFileupload2('icon'); generateFileupload2('icon');