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

前端2期需求未完成

dev_1.0.0
‘wangjiuyun 2024-10-30 11:11:27 +08:00
parent 6a4e423276
commit e1ca488327
10 changed files with 2544 additions and 2150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/resources/static/assets/js/project_budget.js
View File

@ -411,23 +411,8 @@ function checkIfFillIn() {
return; return;
} }
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
return;
}
if (endTime.length <= 0) {
window.confirm('项目计划结束时间不能为空');
check = 1;
return;
}
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
check = 1;
return;
}
// if (projectNo.length <= 0) { // if (projectNo.length <= 0) {
// window.confirm('项目编号不能为空'); // window.confirm('项目编号不能为空');
@ -442,17 +427,8 @@ function checkIfFillIn() {
// return; // return;
// } // }
if (cooperateType == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (cooperateType == 1 && (collaboratorUrl == undefined || collaboratorUrl.length <= 0 )) {
window.confirm('合作对象附件不能为空');
check = 1;
return;
}
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) { if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
@ -646,6 +622,7 @@ function arr2ObjectVerifyCheck(line, arr, detailPropertyArr, detailProperty, s)
function collectData(className) { function collectData(className) {
var a = []; var a = [];
$("." + className).each(function (t) { $("." + className).each(function (t) {
if(!$(this).is(':hidden'))
a.push($(this).val()); a.push($(this).val());
}); });
return a; return a;

8
src/main/resources/static/assets/js/project_budget_cost_project_manage.js
View File

@ -5,31 +5,27 @@
COST_PROJECT_MANAGE_DETAIL2={ COST_PROJECT_MANAGE_DETAIL2={
"num":[false,"序号","string"], "num":[false,"序号","string"],
"type":[false,"费用类别","string"], "type":[false,"费用类别","string"],
"name1":[false,"业务项目","string"], "name":[false,"业务项目","string"],
"detail":[false,"项目明细","string"], "detail":[false,"项目明细","string"],
"detail1":[false,"项目明细","string"],
"total":[false,"总金额","number"], "total":[false,"总金额","number"],
"payTime":[false,"支出时间","string"], "payTime":[false,"支出时间","string"],
"payAmount":[false,"支出金额","number"], "payAmount":[false,"支出金额","number"],
"predictMethod":[false,"预估计算方法","string"], "predictMethod":[false,"预估计算方法","string"],
"predictWhy":[false,"预估依据","string"], "predictWhy":[false,"预估依据","string"],
"remark":[false,"备注","string"], "remark":[false,"备注","string"],
"deletable":[false,"是否可删除","string"]
}; };
COST_PROJECT_MANAGE_DETAIL={ COST_PROJECT_MANAGE_DETAIL={
"num":[false,"序号","string"], "num":[false,"序号","string"],
"type":[false,"费用类别","string"], "type":[false,"费用类别","string"],
"name1":[false,"业务项目","string"], "name":[false,"业务项目","string"],
"detail":[false,"项目明细","string"], "detail":[false,"项目明细","string"],
"detail1":[false,"项目明细","string"],
"total":[false,"总金额","number"], "total":[false,"总金额","number"],
"payTime":[false,"支出时间","string"], "payTime":[false,"支出时间","string"],
"payAmount":[false,"支出金额","number"], "payAmount":[false,"支出金额","number"],
"predictMethod":[false,"预估计算方法","string"], "predictMethod":[false,"预估计算方法","string"],
"predictWhy":[false,"预估依据","string"], "predictWhy":[false,"预估依据","string"],
"remark":[false,"备注","string"], "remark":[false,"备注","string"],
"deletable":[false,"是否可删除","string"]
}; };
SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER={}; SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER={};

18
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -78,6 +78,7 @@ $(function () {
appendTrIncome(); appendTrIncome();
$("#incomeAddBtn").blur(); $("#incomeAddBtn").blur();
}); });
bindTypeSelectChangeIncome()
}); });
@ -186,6 +187,7 @@ function appendTrIncome() {
bindNum(); bindNum();
bindChangeableInput(); bindChangeableInput();
bindIncomeTotal(); bindIncomeTotal();
bindTypeSelectChangeIncome()
//绑定数字输入框保留两位小数 //绑定数字输入框保留两位小数
bindNumberInput(); bindNumberInput();
@ -239,4 +241,20 @@ function bindIncomeTotal() {
updateTotal("input-changeable-total-tax-income", "input-changeable-total-total-tax-income"); updateTotal("input-changeable-total-tax-income", "input-changeable-total-total-tax-income");
}); });
}
function bindTypeSelectChangeIncome() {
//大类变化联动类别
$(".input-changeable-tax-rate-income-select").on('change',function () {
var nameSelect = $(this).parent().parent().find(".input-changeable-tax-rate-income-select");
var nameInput = $(this).parent().parent().find(".input-changeable-tax-rate-income-name");
var type = $(this).val();
if(type == '自定义') {
nameSelect.attr("style", "display:none");
nameInput.attr("type", "text");
} else{
nameSelect.attr("style", "display:block");
nameInput.attr("type", "hidden");
}
});
} }

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

@ -249,16 +249,6 @@
<input readonly value=""/> <input readonly value=""/>
</#if> </#if>
</td> </td>
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目计划开始时间:</span></th>
<td class="table-title" colspan="1"><input readonly
value="${(project.startDate?string("yyyy-MM-dd"))!}"/>
</td>
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目计划结束时间:</span></th>
<td class="table-title" colspan="1"><input readonly
value="${(project.endDate?string("yyyy-MM-dd"))!}"/>
</td>
</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>
@ -288,36 +278,6 @@
</td> </td>
</#if> </#if>
</tr> </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>
<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>
</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" colspan="1"><input readonly <td class="table-title" colspan="1"><input readonly
@ -377,26 +337,26 @@
value="${project.industryScenario!}"/></td> value="${project.industryScenario!}"/></td>
</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 class="table-title" colspan="1"><span style="font-size: 15px">项目解决方案:</span>-->
</th> <#-- </th>-->
<td class="table-title" colspan="1"> <#-- <td class="table-title" colspan="1">-->
<#if project.resolvePlan??> <#-- <#if project.resolvePlan??>-->
<#if (project.resolvePlan!) =1> <#-- <#if (project.resolvePlan!) =1>-->
<input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/> <#-- <input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/>-->
<#elseif (project.resolvePlan!) =2> <#-- <#elseif (project.resolvePlan!) =2>-->
<input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/> <#-- <input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/>-->
<#elseif (project.resolvePlan!) =3> <#-- <#elseif (project.resolvePlan!) =3>-->
<input readonly value="其他生态"/> <#-- <input readonly value="其他生态"/>-->
</#if> <#-- </#if>-->
<#else> <#-- <#else>-->
<input readonly value=""/> <#-- <input readonly value=""/>-->
</#if> <#-- </#if>-->
</td> <#-- </td>-->
<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="1"><input readonly value="${project.customer!}"/></td> <td class="table-title" colspan="2"><input readonly value="${project.customer!}"/></td>
<th class="table-title" colspan="1"><span style="font-size: 15px">最终用户名称:</span> <th class="table-title" colspan="1"><span style="font-size: 15px">最终用户名称:</span>
</th> </th>
<td class="table-title" colspan="1"><input readonly <td class="table-title" colspan="2"><input readonly
value="${project.terminalCustomer!}"/></td> value="${project.terminalCustomer!}"/></td>
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
@ -440,7 +400,7 @@
<input readonly value=""/> <input readonly value=""/>
</#if> </#if>
</td> </td>
<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"> <td class="table-title" colspan="3">
<#if project.signType??> <#if project.signType??>
<#if (project.signType!) =1> <#if (project.signType!) =1>
@ -542,15 +502,15 @@
>${project.stageRemark!}</textarea> >${project.stageRemark!}</textarea>
</td> </td>
</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 class="table-title" colspan="1"><span style="font-size: 15px">下一步计划:</span>-->
</th> <#-- </th>-->
<td class="table-title" colspan="5"> <#-- <td class="table-title" colspan="5">-->
<textarea rows="3" cols="20" style="border-style:none;background-color: white;" <#-- <textarea rows="3" cols="20" style="border-style:none;background-color: white;"-->
disabled="disabled" <#-- disabled="disabled"-->
>${project.nextPlan!}</textarea> <#-- >${project.nextPlan!}</textarea>-->
</td> <#-- </td>-->
</tr> <#-- </tr>-->
</table> </table>
</div> </div>
<#-- 项目预算信息 展示内容 --> <#-- 项目预算信息 展示内容 -->
@ -634,18 +594,7 @@
<input readonly value=""/> <input readonly value=""/>
</#if> </#if>
</td> </td>
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目计划开始时间:</span></th>
<td class="table-title" colspan="1">
<input readonly
value="${(projectBudget.startDateBudget?string("yyyy-MM-dd"))!}">
</td>
<th class="table-title" colspan="1"><span
style="font-size: 15px">项目计划结束时间:</span></th>
<td class="table-title" colspan="1">
<input readonly
value="${(projectBudget.endDateBudget?string("yyyy-MM-dd"))!}">
</td>
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span <th class="table-title" colspan="1"><span
@ -684,43 +633,7 @@
value="${Utils.format(projectBudget.advancePeakAmountBudget)}"/> value="${Utils.format(projectBudget.advancePeakAmountBudget)}"/>
</td> </td>
</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>
<td class="table-title" colspan="1" id="spanMode">
<#if projectBudget.cooperateTypeBudget??>
<#if (projectBudget.cooperateTypeBudget) =1>
<input readonly value="战略合作类"/>
<#elseif (projectBudget.cooperateTypeBudget) =2>
<input readonly value="非战略合作类"/>
</#if>
<#else>
<input readonly value=""/>
</#if>
</td>
<th class="table-title" colspan="1" id="coop1b"
<#if projectBudget.cooperateTypeBudget! != 1>hidden</#if> ><span
style="font-size: 15px">合作对象:</span></th>
<td class="table-title" colspan="3" id="coop2b"
<#if projectBudget.cooperateTypeBudget! != 1>hidden</#if> >
<#if projectBudget.collaboratorUrlBudget?? && projectBudget.collaboratorUrlBudget != "">
<div class="am-form-file am-text-xs">
<a href="${projectBudget.collaboratorUrlBudget!}" 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>
<th class="table-title" colspan="4" id="coop0b"
<#if projectBudget.cooperateTypeBudget! == 1>hidden</#if>></th>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span <th class="table-title" colspan="1"><span
style="font-size: 15px">合同金额:</span></th> style="font-size: 15px">合同金额:</span></th>
<td class="table-title" colspan="1"> <td class="table-title" colspan="1">
@ -804,29 +717,29 @@
</td> </td>
</tr> </tr>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span <#-- <th class="table-title" colspan="1"><span-->
style="font-size: 15px">项目解决方案:</span></th> <#-- style="font-size: 15px">项目解决方案:</span></th>-->
<td class="table-title" colspan="1"> <#-- <td class="table-title" colspan="1">-->
<#if projectBudget.resolvePlanBudget??> <#-- <#if projectBudget.resolvePlanBudget??>-->
<#if (projectBudget.resolvePlanBudget!) =1> <#-- <#if (projectBudget.resolvePlanBudget!) =1>-->
<input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/> <#-- <input readonly value="公共服务(智慧交通、雪亮工程、治安防控体系等)"/>-->
<#elseif (projectBudget.resolvePlanBudget!) =2> <#-- <#elseif (projectBudget.resolvePlanBudget!) =2>-->
<input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/> <#-- <input readonly value="泛行业(智慧园区、智慧医疗、智慧工地等)"/>-->
<#elseif (projectBudget.resolvePlanBudget!) =3> <#-- <#elseif (projectBudget.resolvePlanBudget!) =3>-->
<input readonly value="其他生态"/> <#-- <input readonly value="其他生态"/>-->
</#if> <#-- </#if>-->
<#else> <#-- <#else>-->
<input readonly value=""/> <#-- <input readonly value=""/>-->
</#if> <#-- </#if>-->
</td> <#-- </td>-->
<th class="table-title" colspan="1"><span <th class="table-title" colspan="1"><span
style="font-size: 15px">客户名称:</span></th> style="font-size: 15px">客户名称:</span></th>
<td class="table-title" colspan="1"> <td class="table-title" colspan="2">
<input readonly value="${projectBudget.customerBudget!}"/> <input readonly value="${projectBudget.customerBudget!}"/>
</td> </td>
<th class="table-title" colspan="1"><span <th class="table-title" colspan="1"><span
style="font-size: 15px">最终用户名称:</span></th> style="font-size: 15px">最终用户名称:</span></th>
<td class="table-title" colspan="1"> <td class="table-title" colspan="2">
<input readonly value="${projectBudget.terminalCustomerBudget!}"/> <input readonly value="${projectBudget.terminalCustomerBudget!}"/>
</td> </td>
</tr> </tr>
@ -877,7 +790,7 @@
<input readonly value=""/> <input readonly value=""/>
</#if> </#if>
</td> </td>
<th class="table-title" colspan="1"><span style="font-size: 15px">直签:</span> <th class="table-title" colspan="1"><span style="font-size: 15px">是否汇智中标:</span>
</th> </th>
<td class="table-title" colspan="3"> <td class="table-title" colspan="3">
<#if projectBudget.signTypeBudget??> <#if projectBudget.signTypeBudget??>
@ -1756,16 +1669,16 @@
style="padding:0;"> style="padding:0;">
<tbody> <tbody>
<tr class="am-text-lg"> <tr class="am-text-lg">
<td>类别</td> <#-- <td>类别</td>-->
<td>费用</td> <#-- <td>费用</td>-->
<td>费用项目</td> <td>费用项目</td>
<td>含税金额（元）</td> <td>含税金额（元）</td>
<td>不含税金额（元）</td> <td>不含税金额（元）</td>
<td width="210px">税金（元）</td> <td width="210px">税金（元）</td>
</tr> </tr>
<tr> <tr>
<td>成本</td> <#-- <td>成本</td>-->
<td>采购成本</td> <#-- <td>采购成本</td>-->
<td>设备</td> <td>设备</td>
<td><input type="text" class="number" name="costPurchaseDeviceTaxInclude" <td><input type="text" class="number" name="costPurchaseDeviceTaxInclude"
value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0.00')}" value="${Utils.format(budgetBean.costPurchaseDeviceTaxInclude,'0.00')}"
@ -1778,8 +1691,8 @@
readonly required title="购买设备税金"></td> readonly required title="购买设备税金"></td>
</tr> </tr>
<tr> <tr>
<td>成本</td> <#-- <td>成本</td>-->
<td>采购成本</td> <#-- <td>采购成本</td>-->
<td>工程</td> <td>工程</td>
<td><input type="text" class="number" name="costPurchaseBuildTaxInclude" <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0.00')}" value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0.00')}"
@ -1792,8 +1705,8 @@
readonly required title="购买施工税金"></td> readonly required title="购买施工税金"></td>
</tr> </tr>
<tr> <tr>
<td>成本</td> <#-- <td>成本</td>-->
<td>采购成本</td> <#-- <td>采购成本</td>-->
<td>服务</td> <td>服务</td>
<td><input type="text" class="number" name="costPurchaseServiceTaxInclude" <td><input type="text" class="number" name="costPurchaseServiceTaxInclude"
value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0.00')}" value="${Utils.format(budgetBean.costPurchaseServiceTaxInclude,'0.00')}"
@ -1807,8 +1720,8 @@
readonly required title="购买服务税金"></td> readonly required title="购买服务税金"></td>
</tr> </tr>
<tr> <tr>
<td>成本</td> <#-- <td>成本</td>-->
<td>采购成本</td> <#-- <td>采购成本</td>-->
<td>其他</td> <td>其他</td>
<td><input type="text" class="number" name="costPurchaseOtherTaxInclude" <td><input type="text" class="number" name="costPurchaseOtherTaxInclude"
value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0.00')}" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0.00')}"
@ -1834,20 +1747,20 @@
<#-- value="财务计取以不含税方式核算"--> <#-- value="财务计取以不含税方式核算"-->
<#-- readonly required title=""></td>--> <#-- readonly required title=""></td>-->
<#-- </tr>--> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>成本</td> <#-- <td>成本</td>-->
<td>其他</td> <#-- <td>其他</td>-->
<td class="huanhang">${project.otherName!}</td> <#-- <td class="huanhang">${project.otherName!}</td>-->
<td><input type="text" class="number" name="costOtherOtherTaxInclude" <#-- <td><input type="text" class="number" name="costOtherOtherTaxInclude"-->
value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}" <#-- value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0.00')}"-->
required readonly title="其他含税总额（填入）"></td> <#-- required readonly title="其他含税总额（填入）"></td>-->
<td><input type="text" class="number" name="costOtherOtherTaxExclude" <#-- <td><input type="text" class="number" name="costOtherOtherTaxExclude"-->
value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" <#-- value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}"-->
required readonly title="其他不含税总额（填入）"></td> <#-- required readonly title="其他不含税总额（填入）"></td>-->
<td width="210px"><input type="text" class="number" name="costOtherOtherTax" <#-- <td width="210px"><input type="text" class="number" name="costOtherOtherTax"-->
value="${Utils.format(budgetBean.costOtherOtherTax,'0.00')}" <#-- value="${Utils.format(budgetBean.costOtherOtherTax,'0.00')}"-->
required readonly title="其他税金"></td> <#-- required readonly title="其他税金"></td>-->
</tr> <#-- </tr>-->
<tr> <tr>
<td>合计</td> <td>合计</td>
<td></td> <td></td>
@ -1946,119 +1859,119 @@
</tbody> </tbody>
</table> </table>
<span class="am-text-lg">现金流量表</span> <#-- <span class="am-text-lg">现金流量表</span>-->
<#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>--> <#-- &lt;#&ndash;<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>&ndash;&gt;-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"> <#-- <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">-->
<tbody> <#-- <tbody>-->
<tr> <#-- <tr>-->
<td>类别</td> <#-- <td>类别</td>-->
<td>金额（元）</td> <#-- <td>金额（元）</td>-->
<td>计算方式</td> <#-- <td>计算方式</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>销售商品、提供劳务收到的现金<#--a--></td> <#-- <td>销售商品、提供劳务收到的现金&lt;#&ndash;a&ndash;&gt;</td>-->
<td><input type="text" class="number" name="saleIncomeCash" <#-- <td><input type="text" class="number" name="saleIncomeCash"-->
value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly-->
required title="取自资金计划表（销售收款）"></td> <#-- required title="取自资金计划表（销售收款）"></td>-->
<td>从资金计划表查(销售收款)</td> <#-- <td>从资金计划表查(销售收款)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>收到的税费返还<#--b--></td> <#-- <td>收到的税费返还&lt;#&ndash;b&ndash;&gt;</td>-->
<td>/<input type="hidden" name="taxReturn" <#-- <td>/<input type="hidden" name="taxReturn"-->
value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.taxReturn,'0')}" readonly-->
required></td> <#-- required></td>-->
<td>/</td> <#-- <td>/</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>收到其他与经营活动有关的现金<#--c--></td> <#-- <td>收到其他与经营活动有关的现金&lt;#&ndash;c&ndash;&gt;</td>-->
<td><input type="text" class="number" name="earnestMoneyIncome" <#-- <td><input type="text" class="number" name="earnestMoneyIncome"-->
value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly-->
required title="取自资金计划表（保证金收款）"></td> <#-- required title="取自资金计划表（保证金收款）"></td>-->
<td>从资金计划表查(保证金收款)</td> <#-- <td>从资金计划表查(保证金收款)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>购买商品、接受劳务支付的现金<#--d--></td> <#-- <td>购买商品、接受劳务支付的现金&lt;#&ndash;d&ndash;&gt;</td>-->
<td><input type="text" class="number" name="purchaseCost" <#-- <td><input type="text" class="number" name="purchaseCost"-->
value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly-->
required title="取自资金计划表（设备支出+工程支出）"></td> <#-- required title="取自资金计划表（设备支出+工程支出）"></td>-->
<td>从资金计划表查(设备支出+工程支出)</td> <#-- <td>从资金计划表查(设备支出+工程支出)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>支付的各项税费<#--e--></td> <#-- <td>支付的各项税费&lt;#&ndash;e&ndash;&gt;</td>-->
<td>/<input type="hidden" name="taxCost" <#-- <td>/<input type="hidden" name="taxCost"-->
value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required> <#-- value="${Utils.format(cashFlowBean.taxCost,'0')}" readonly required>-->
</td> <#-- </td>-->
<td>/</td> <#-- <td>/</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>支付其他与经营活动有关的现金<#--f--></td> <#-- <td>支付其他与经营活动有关的现金&lt;#&ndash;f&ndash;&gt;</td>-->
<td><input type="text" class="number" name="earnestMoneyCost" <#-- <td><input type="text" class="number" name="earnestMoneyCost"-->
value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly-->
required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td> <#-- required title="取自资金计划表（经营性开支+保证金支出+资金利息）"></td>-->
<td>从资金计划表查(经营性开支+保证金支出+资金利息)</td> <#-- <td>从资金计划表查(经营性开支+保证金支出+资金利息)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>经营活动产生的现金流量净额<#--g--></td> <#-- <td>经营活动产生的现金流量净额&lt;#&ndash;g&ndash;&gt;</td>-->
<td><input type="text" class="number" name="netCashFlow" <#-- <td><input type="text" class="number" name="netCashFlow"-->
value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly <#-- value="${Utils.format(cashFlowBean.netCashFlow,'0')}" readonly-->
required title="g=a+c+b-d-f-e"></td> <#-- required title="g=a+c+b-d-f-e"></td>-->
<td> <#-- <td>-->
销售商品、提供劳务收到的现金+收到的税费返还+收到其他与经营活动有关的现金-购买商品、接受劳务支付的现金-支付的各项税费-支付其他与经营活动有关的现金 <#-- 销售商品、提供劳务收到的现金+收到的税费返还+收到其他与经营活动有关的现金-购买商品、接受劳务支付的现金-支付的各项税费-支付其他与经营活动有关的现金-->
</td> <#-- </td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>投资活动现金流入<#--h--></td> <#-- <td>投资活动现金流入&lt;#&ndash;h&ndash;&gt;</td>-->
<td>/<input type="hidden" name="cashInflowFromInvestingActivities" <#-- <td>/<input type="hidden" name="cashInflowFromInvestingActivities"-->
value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}" <#-- value="${Utils.format(cashFlowBean.cashInflowFromInvestingActivities,'0')}"-->
readonly required></td> <#-- readonly required></td>-->
<td>/</td> <#-- <td>/</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>投资活动现金流出<#--i--></td> <#-- <td>投资活动现金流出&lt;#&ndash;i&ndash;&gt;</td>-->
<td>/<input type="hidden" name="cashOutflowFromInvestingActivities" <#-- <td>/<input type="hidden" name="cashOutflowFromInvestingActivities"-->
value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}" <#-- value="${Utils.format(cashFlowBean.cashOutflowFromInvestingActivities,'0')}"-->
readonly required></td> <#-- readonly required></td>-->
<td>/</td> <#-- <td>/</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>投资活动产生的现金流量净额<#--j--></td> <#-- <td>投资活动产生的现金流量净额&lt;#&ndash;j&ndash;&gt;</td>-->
<td>/<input type="hidden" name="netCashFromInvestingActivities" <#-- <td>/<input type="hidden" name="netCashFromInvestingActivities"-->
value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}" <#-- value="${Utils.format(cashFlowBean.netCashFromInvestingActivities,'0')}"-->
readonly required></td> <#-- readonly required></td>-->
<td>/</td> <#-- <td>/</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>融资资金流入<#--k--></td> <#-- <td>融资资金流入&lt;#&ndash;k&ndash;&gt;</td>-->
<td><input type="text" class="number" name="financingCapitalInflow" <#-- <td><input type="text" class="number" name="financingCapitalInflow"-->
value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" <#-- value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}"-->
readonly required title="从资金计划表查（垫资计划）"></td> <#-- readonly required title="从资金计划表查（垫资计划）"></td>-->
<td>从资金计划表查(垫资计划)</td> <#-- <td>从资金计划表查(垫资计划)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>还款资金流出<#--l--></td> <#-- <td>还款资金流出&lt;#&ndash;l&ndash;&gt;</td>-->
<td><input type="text" class="number" name="financingCapitalOutflow" <#-- <td><input type="text" class="number" name="financingCapitalOutflow"-->
value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" <#-- value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}"-->
readonly required title="从资金计划表查（还款计划）"></td> <#-- readonly required title="从资金计划表查（还款计划）"></td>-->
<td>从资金计划表查(还款计划)</td> <#-- <td>从资金计划表查(还款计划)</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>筹资活动产生的现金流量净额<#--m--></td> <#-- <td>筹资活动产生的现金流量净额&lt;#&ndash;m&ndash;&gt;</td>-->
<td><input type="text" class="number" name="financingCapitalCashflow" <#-- <td><input type="text" class="number" name="financingCapitalCashflow"-->
value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}" <#-- value="${Utils.format(cashFlowBean.financingCapitalCashflow,'0')}"-->
readonly required title="m=k-l"></td> <#-- readonly required title="m=k-l"></td>-->
<td>融资资金流入-还款资金流出</td> <#-- <td>融资资金流入-还款资金流出</td>-->
</tr> <#-- </tr>-->
<tr> <#-- <tr>-->
<td>货币资金净增加额<#--n--></td> <#-- <td>货币资金净增加额&lt;#&ndash;n&ndash;&gt;</td>-->
<td><input type="text" class="number" name="netIncreaseMonetaryFunds" <#-- <td><input type="text" class="number" name="netIncreaseMonetaryFunds"-->
value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}" <#-- value="${Utils.format(cashFlowBean.netIncreaseMonetaryFunds,'0')}"-->
readonly required title="n=g+j+m"></td> <#-- readonly required title="n=g+j+m"></td>-->
<td> <#-- <td>-->
经营活动产生的现金流量净额+投资活动产生的现金流量净额+筹资活动产生的现金流量净额 <#-- 经营活动产生的现金流量净额+投资活动产生的现金流量净额+筹资活动产生的现金流量净额-->
</td> <#-- </td>-->
</tr> <#-- </tr>-->
</tbody> <#-- </tbody>-->
</table> <#-- </table>-->
<!--endprint--> <!--endprint-->
</div> </div>
</div> </div>

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

File diff suppressed because it is too large Load Diff

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

@ -73,22 +73,6 @@
<option value="2" >设备集成类</option> <option value="2" >设备集成类</option>
</select> </select>
</td> </td>
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目计划开始时间:</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 >
</td>
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目计划结束时间:</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 >
</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>
@ -115,36 +99,6 @@
value="" /> value="" />
</td> </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>
</td>
<th class="table-title" colspan="1" id="coop1" ><span style="color: red;">*</span><span style="font-size: 15px">合作对象:</span></th>
<td class="table-title" colspan="3" id="coop2" >
<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>
</div>
</td>
<th class="table-title" colspan="4" id="coop0" hidden></th>
</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>
@ -218,22 +172,22 @@
</td> </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>-->
<td class="table-title" colspan="1" > <#-- <td class="table-title" colspan="1" >-->
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan"> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan">-->
<option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" >其他生态</option> <#-- <option value="3" >其他生态</option>-->
</select> <#-- </select>-->
</td> <#-- </td>-->
<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="2" >
<input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入客户名称（1000字符以内）" <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" name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
value="" /> value="" />
</td> </td>
<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="2" >
<input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）" <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" name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
value="" /> value="" />
@ -291,7 +245,7 @@
<option value="2" >否</option> <option value="2" >否</option>
</select> </select>
</td> </td>
<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" > <td class="table-title" colspan="3" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
<option value="-1" ></option> <option value="-1" ></option>
@ -367,15 +321,15 @@
></textarea> ></textarea>
</td> </td>
</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" colspan="5" > <#-- <td class="table-title" colspan="5" >-->
<textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000" <#-- <textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000"-->
class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划" <#-- class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划"-->
placeholder="下一步计划" <#-- placeholder="下一步计划"-->
></textarea> <#-- ></textarea>-->
</td> <#-- </td>-->
</tr> <#-- </tr>-->
</table> </table>
<#-- <div class="am-tabs-bd">--> <#-- <div class="am-tabs-bd">-->
<#-- <div class="am-tab-panel am-fade am-in" id="tab2">--> <#-- <div class="am-tab-panel am-fade am-in" id="tab2">-->
@ -775,23 +729,7 @@
return; return;
} }
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
return;
}
if (endTime.length <= 0) {
window.confirm('项目计划结束时间不能为空');
check = 1;
return;
}
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
check = 1;
return;
}
// if (projectNo.length <= 0) { // if (projectNo.length <= 0) {
// window.confirm('项目编号不能为空'); // window.confirm('项目编号不能为空');
@ -806,17 +744,7 @@
// return; // return;
// } // }
if (cooperateType == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (cooperateType == 1 && (collaboratorUrl == undefined || collaboratorUrl.length <= 0 )) {
window.confirm('合作对象附件不能为空');
check = 1;
return;
}
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) { if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {

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

@ -77,22 +77,6 @@
<option value="2" <#if project.type=2>selected</#if>>设备集成类</option> <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
</select> </select>
</td> </td>
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目计划开始时间:</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 >
</td>
<th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目计划结束时间:</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 >
</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>
@ -119,36 +103,6 @@
value="${Utils.format(project.advancePeakAmount)}" /> value="${Utils.format(project.advancePeakAmount)}" />
</td> </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">
<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>
</div>
</td>
<th class="table-title" colspan="4" id="coop0" <#if project.cooperateType! == 1>hidden</#if>></th>
</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>
@ -245,28 +199,28 @@
</td> </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>-->
<td class="table-title" colspan="1" > <#-- <td class="table-title" colspan="1" >-->
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan"> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="resolvePlan" name="resolvePlan">-->
<#if project.resolvePlan??> <#-- <#if project.resolvePlan??>-->
<option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" <#if project.resolvePlan=1>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" <#if project.resolvePlan=2>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option> <#-- <option value="3" <#if project.resolvePlan=3>selected</#if>>其他生态</option>-->
<#else> <#-- <#else>-->
<option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" >公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" >泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" >其他生态</option> <#-- <option value="3" >其他生态</option>-->
</#if> <#-- </#if>-->
</select> <#-- </select>-->
</td> <#-- </td>-->
<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="2" >
<input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入客户名称（1000字符以内）" <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" name="customer" id="customer" placeholder="请输入客户名称（1000字符以内）" maxlength="1000"
value="${project.customer!}" /> value="${project.customer!}" />
</td> </td>
<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="2" >
<input type="text" class="am-input" style="border-style:none;" data-validate-async data-validation-message="请输入最终用户名称（1000字符以内）" <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" name="terminalCustomer" id="terminalCustomer" placeholder="请输入最终用户名称（1000字符以内）" maxlength="1000"
value="${project.terminalCustomer!}" /> value="${project.terminalCustomer!}" />
@ -331,7 +285,7 @@
</#if> </#if>
</select> </select>
</td> </td>
<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" > <td class="table-title" colspan="3" >
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType"> <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
<#if project.signType??> <#if project.signType??>
@ -414,15 +368,15 @@
>${project.stageRemark!}</textarea> >${project.stageRemark!}</textarea>
</td> </td>
</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" colspan="5" > <#-- <td class="table-title" colspan="5" >-->
<textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000" <#-- <textarea rows="3" cols="20" id="nextPlan" name="nextPlan" maxlength="1000"-->
class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划" <#-- class="am-input" style="border-style:none;" data-validate-async data-validation-message="下一步计划"-->
placeholder="下一步计划" <#-- placeholder="下一步计划"-->
>${project.nextPlan!}</textarea> <#-- >${project.nextPlan!}</textarea>-->
</td> <#-- </td>-->
</tr> <#-- </tr>-->
</table> </table>
</div> </div>
</div> </div>
@ -832,23 +786,6 @@
return; return;
} }
if (startTime.length <= 0) {
window.confirm('项目计划开始时间不能为空');
check = 1;
return;
}
if (endTime.length <= 0) {
window.confirm('项目计划结束时间不能为空');
check = 1;
return;
}
if (startTime > endTime) {
window.confirm('开始日期应早于结束日期');
check = 1;
return;
}
// if (projectNo.length <= 0) { // if (projectNo.length <= 0) {
// window.confirm('项目编号不能为空'); // window.confirm('项目编号不能为空');
@ -863,17 +800,8 @@
// return; // return;
// } // }
if (cooperateType == 1 && (collaborator == undefined || collaborator.length <= 0 )) {
window.confirm('合作对象不能为空');
check = 1;
return;
}
if (cooperateType == 1 && (collaboratorUrl == undefined || collaboratorUrl.length <= 0 )) {
window.confirm('合作对象附件不能为空');
check = 1;
return;
}
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) { if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {

57
src/main/resources/templates/admin/project_list.ftl
View File

@ -281,16 +281,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="st-col">
<div class="st-col-title">合作类型</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
<option value="-1">全部</option>
<option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
<option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
</select>
</div>
</div>
<div class="st-col"> <div class="st-col">
<div class="st-col-title">垫资模式</div> <div class="st-col-title">垫资模式</div>
<div class="st-col-field"> <div class="st-col-field">
@ -358,7 +349,7 @@
</div> </div>
</div> </div>
<div class="st-col expand-section <#if extend='1'> fold</#if>"> <div class="st-col expand-section <#if extend='1'> fold</#if>">
<div class="st-col-title">直签</div> <div class="st-col-title">是否汇智中标</div>
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
<option value="-1">全部</option> <option value="-1">全部</option>
@ -392,17 +383,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="st-col"> <#-- <div class="st-col">-->
<div class="st-col-title">项目解决方案</div> <#-- <div class="st-col-title">项目解决方案</div>-->
<div class="st-col-field"> <#-- <div class="st-col-field">-->
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan"> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan">-->
<option value="-1">全部</option> <#-- <option value="-1">全部</option>-->
<option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option> <#-- <option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>-->
</select> <#-- </select>-->
</div> <#-- </div>-->
</div> <#-- </div>-->
<div class="st-col"> <div class="st-col">
<div class="st-col-title">最后更新时间</div> <div class="st-col-title">最后更新时间</div>
<div class="flex-row st-col-field"> <div class="flex-row st-col-field">
@ -701,7 +692,7 @@
<#-- </select>--> <#-- </select>-->
<#-- </div>--> <#-- </div>-->
<#-- </td>--> <#-- </td>-->
<#-- <th class="am-text-middle" style="width: 10%">直签</th>--> <#-- <th class="am-text-middle" style="width: 10%">是否汇智中标</th>-->
<#-- <td style="width: 15%">--> <#-- <td style="width: 15%">-->
<#-- <div class="am-u-sm-10">--> <#-- <div class="am-u-sm-10">-->
<#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500}" id="signType" name="signType">--> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '150px',maxHeight: 500}" id="signType" name="signType">-->
@ -900,7 +891,7 @@
<#--<th class="table-title">预计合同签订时间</th>--> <#--<th class="table-title">预计合同签订时间</th>-->
<#--<th class="table-title">项目计划招标时间</th>--> <#--<th class="table-title">项目计划招标时间</th>-->
<#--<th class="table-title">是否二次合作</th>--> <#--<th class="table-title">是否二次合作</th>-->
<#--<th class="table-title">直签</th>--> <#--<th class="table-title">是否汇智中标</th>-->
<#--<th class="table-title">战略合作对象</th>--> <#--<th class="table-title">战略合作对象</th>-->
<#--<th class="table-title">项目负责人</th>--> <#--<th class="table-title">项目负责人</th>-->
<#--<th class="table-title">审核状态</th>--> <#--<th class="table-title">审核状态</th>-->
@ -1009,7 +1000,7 @@
<#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>--> <#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>-->
<#--是否二次合作--> <#--是否二次合作-->
<#--<td>${list.isSecondStr!}</td>--> <#--<td>${list.isSecondStr!}</td>-->
<#--直签--> <#--是否汇智中标-->
<#--<td>${list.signTypeStr!}</td>--> <#--<td>${list.signTypeStr!}</td>-->
<#--战略合作对象--> <#--战略合作对象-->
<#--<td>${list.collaborator!}</td>--> <#--<td>${list.collaborator!}</td>-->
@ -1394,14 +1385,14 @@
<div class="am-u-sm-3 am-u-md-3 input-msg"></div> <div class="am-u-sm-3 am-u-md-3 input-msg"></div>
</div> </div>
<div class="am-g am-form-group am-margin-top" style="display: flex;"> <#-- <div class="am-g am-form-group am-margin-top" style="display: flex;">-->
<div class="am-u-sm-3 am-u-md-3 am-text-right"> <#-- <div class="am-u-sm-3 am-u-md-3 am-text-right">-->
下一步计划</div> <#-- 下一步计划</div>-->
<div class="am-u-sm-6 am-u-md-6"> <#-- <div class="am-u-sm-6 am-u-md-6">-->
<textarea id="nextPlan" minlength="1" rows="3" cols="40" maxlength="1000" class="am-input"></textarea> <#-- <textarea id="nextPlan" minlength="1" rows="3" cols="40" maxlength="1000" class="am-input"></textarea>-->
</div> <#-- </div>-->
<div class="am-u-sm-3 am-u-md-3 input-msg"></div> <#-- <div class="am-u-sm-3 am-u-md-3 input-msg"></div>-->
</div> <#-- </div>-->
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" data-am-modal-cancel>关闭</button> <button type="button" class="btn btn-default" data-dismiss="modal" data-am-modal-cancel>关闭</button>

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

@ -218,16 +218,6 @@
</select> </select>
</div> </div>
</div> </div>
<div class="st-col">
<div class="st-col-title">合作类型</div>
<div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
<option value="-1">全部</option>
<option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
<option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
</select>
</div>
</div>
<div class="st-col"> <div class="st-col">
<div class="st-col-title">垫资模式</div> <div class="st-col-title">垫资模式</div>
<div class="st-col-field"> <div class="st-col-field">
@ -295,7 +285,7 @@
</div> </div>
</div> </div>
<div class="st-col expand-section <#if extend='1'> fold</#if>"> <div class="st-col expand-section <#if extend='1'> fold</#if>">
<div class="st-col-title">直签</div> <div class="st-col-title">是否汇智中标</div>
<div class="st-col-field"> <div class="st-col-field">
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType"> <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
<option value="-1">全部</option> <option value="-1">全部</option>
@ -329,17 +319,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="st-col"> <#-- <div class="st-col">-->
<div class="st-col-title">项目解决方案</div> <#-- <div class="st-col-title">项目解决方案</div>-->
<div class="st-col-field"> <#-- <div class="st-col-field">-->
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan"> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan">-->
<option value="-1">全部</option> <#-- <option value="-1">全部</option>-->
<option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option> <#-- <option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>-->
</select> <#-- </select>-->
</div> <#-- </div>-->
</div> <#-- </div>-->
<div class="st-col"> <div class="st-col">
<div class="st-col-title">最后更新时间</div> <div class="st-col-title">最后更新时间</div>
<div class="flex-row st-col-field"> <div class="flex-row st-col-field">
@ -545,7 +535,7 @@
<#--<th class="table-title">预计合同签订时间</th>--> <#--<th class="table-title">预计合同签订时间</th>-->
<#--<th class="table-title">项目计划招标时间</th>--> <#--<th class="table-title">项目计划招标时间</th>-->
<#--<th class="table-title">是否二次合作</th>--> <#--<th class="table-title">是否二次合作</th>-->
<#--<th class="table-title">直签</th>--> <#--<th class="table-title">是否汇智中标</th>-->
<#--<th class="table-title">战略合作对象</th>--> <#--<th class="table-title">战略合作对象</th>-->
<#--<th class="table-title">项目负责人</th>--> <#--<th class="table-title">项目负责人</th>-->
<#--<th class="table-title">审核状态</th>--> <#--<th class="table-title">审核状态</th>-->
@ -641,7 +631,7 @@
<#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>--> <#--<td>${(list.bidsTime?string("yyyy-MM-dd"))!}</td>-->
<#--是否二次合作--> <#--是否二次合作-->
<#--<td>${list.isSecondStr!}</td>--> <#--<td>${list.isSecondStr!}</td>-->
<#--直签--> <#--是否汇智中标-->
<#--<td>${list.signTypeStr!}</td>--> <#--<td>${list.signTypeStr!}</td>-->
<#--战略合作对象--> <#--战略合作对象-->
<#--<td>${list.collaborator!}</td>--> <#--<td>${list.collaborator!}</td>-->

22
src/main/resources/templates/admin/space_list.ftl
View File

@ -223,17 +223,17 @@
</select> </select>
</div> </div>
</div> </div>
<div class="st-col"> <#-- <div class="st-col">-->
<div class="st-col-title">项目解决方案</div> <#-- <div class="st-col-title">项目解决方案</div>-->
<div class="st-col-field"> <#-- <div class="st-col-field">-->
<select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan"> <#-- <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="resolvePlan" name="resolvePlan">-->
<option value="-1">全部</option> <#-- <option value="-1">全部</option>-->
<option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option> <#-- <option value="1" <#if resolvePlan?? && resolvePlan='1'>selected</#if>>公共服务(智慧交通、雪亮工程、治安防控体系等)</option>-->
<option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option> <#-- <option value="2" <#if resolvePlan?? && resolvePlan='2'>selected</#if>>泛行业(智慧园区、智慧医疗、智慧工地等)</option>-->
<option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option> <#-- <option value="3" <#if resolvePlan?? && resolvePlan='3'>selected</#if>>其他生态</option>-->
</select> <#-- </select>-->
</div> <#-- </div>-->
</div> <#-- </div>-->
</div> </div>
<!-- 第三行 --> <!-- 第三行 -->
<div class="flex-row st-row"> <div class="flex-row st-row">