基本完成
‘wangjiuyun
parent
5209e2c8d0
commit
07a6165c2a
|
|
@ -168,9 +168,9 @@ function appendTrIncome() {
|
|||
' </select>\n' +
|
||||
' </td>' +
|
||||
'<td>' +
|
||||
'<select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category input-changeable-tax-rate-income-select">' +
|
||||
'<select style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-income am-modal-prompt-input-income-category input-changeable-tax-rate-income-select">' +
|
||||
'<option value="华智产品">华智产品 </option> <option value="华三产品">华三产品 </option><option value="汇智产品"> 汇智产品</option><option value="自定义">自定义</option>' +
|
||||
'<input type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-income-name">' +
|
||||
'<input type="hidden" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate-income-name">' +
|
||||
'</select>' +
|
||||
'</td>' +
|
||||
' <td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate input-changeable-tax-rate-income"></td>\n' +
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ BUDGET_PLAN_DETAIL2={
|
|||
"serviceCost ":[false,"服务付款","number"],
|
||||
"otherCost":[false,"其他付款","number"],
|
||||
"projectManageCost":[false,"经营性开支","number"],
|
||||
"earnestMoneyCost":[false,"保证金支出","number"],
|
||||
"earnestMoneyCost":[false,"保证金付款","number"],
|
||||
"totalCost":[false,"支出合计","number"],
|
||||
"saleIncome":[false,"销售收款","number"],
|
||||
"earnestMoneyIncome":[false,"保证金收款","number"],
|
||||
|
|
@ -27,7 +27,7 @@ BUDGET_PLAN_DETAIL={
|
|||
"serviceCost ":[false,"服务付款","number"],
|
||||
"otherCost":[false,"其他付款","number"],
|
||||
"projectManageCost":[true,"经营性开支","number"],
|
||||
"earnestMoneyCost":[true,"保证金支出","number"],
|
||||
"earnestMoneyCost":[true,"保证金付款","number"],
|
||||
"totalCost":[true,"支出合计","number"],
|
||||
"saleIncome":[true,"销售收款","number"],
|
||||
"earnestMoneyIncome":[true,"保证金收款","number"],
|
||||
|
|
@ -356,7 +356,7 @@ function verifyBudgetPlan(){
|
|||
|
||||
//从采购成本明细中取“设备”大类下的总计---设备支出
|
||||
if(costPurchaseDeviceTaxInclude != input_total_device_cost_budget_plan){
|
||||
return "采购成本明细中取“设备”费用项目下的总计["+costPurchaseDeviceTaxInclude+"]与资金计划表中设备支出["+input_total_device_cost_budget_plan+"]不等";
|
||||
return "采购成本明细中取“设备”费用项目下的总计["+costPurchaseDeviceTaxInclude+"]与资金计划表中设备付款["+input_total_device_cost_budget_plan+"]不等";
|
||||
}
|
||||
//从采购成本明细中取“服务+施工+其他”大类的总计---工程支出
|
||||
var t = f2(f2(costPurchaseBuildTaxInclude)+f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude));
|
||||
|
|
@ -372,9 +372,9 @@ function verifyBudgetPlan(){
|
|||
if(incomeTotalTaxInclude != input_total_sale_income_budget_plan){
|
||||
return "销售收入明细金额["+incomeTotalTaxInclude+"]与资金计划表中销售收款["+input_total_sale_income_budget_plan+"]不等";
|
||||
}
|
||||
//保证金支出和收入一致
|
||||
//保证金付款和收入一致
|
||||
if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){
|
||||
return "资金计划表中保证金支出["+input_total_earnest_money_cost_budget_plan+"]与保证金收款["+input_total_earnest_money_income_budget_plan+"]不等";
|
||||
return "资金计划表中保证金付款["+input_total_earnest_money_cost_budget_plan+"]与保证金收款["+input_total_earnest_money_income_budget_plan+"]不等";
|
||||
}
|
||||
|
||||
return "";
|
||||
|
|
@ -545,7 +545,7 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
//设备支出改变
|
||||
$(".input-changeable-device-cost-budget-plan").change(function () {
|
||||
var deviceCost = f2($(this).val());
|
||||
//找到对应的工程支出、经营性支出、保证金支出
|
||||
//找到对应的工程支出、经营性支出、保证金付款
|
||||
var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val());
|
||||
var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
|
||||
var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
|
||||
|
|
@ -563,7 +563,7 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
//工程支出改变
|
||||
$(".input-changeable-projectCost-cost-budget-plan").change(function () {
|
||||
var engineerCost = f2($(this).val());
|
||||
//找到对应的设备支出、经营性支出、保证金支出
|
||||
//找到对应的设备支出、经营性支出、保证金付款
|
||||
var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val());
|
||||
var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
|
||||
var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
|
||||
|
|
@ -582,7 +582,7 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
});
|
||||
$(".input-changeable-serviceCost-cost-budget-plan").change(function () {
|
||||
var engineerCost = f2($(this).val());
|
||||
//找到对应的设备支出、经营性支出、保证金支出
|
||||
//找到对应的设备支出、经营性支出、保证金付款
|
||||
var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val());
|
||||
var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
|
||||
var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
|
||||
|
|
@ -601,7 +601,7 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
});
|
||||
$(".input-changeable-otherCost-cost-budget-plan").change(function () {
|
||||
var engineerCost = f2($(this).val());
|
||||
//找到对应的设备支出、经营性支出、保证金支出
|
||||
//找到对应的设备支出、经营性支出、保证金付款
|
||||
var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val());
|
||||
var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
|
||||
var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
|
||||
|
|
@ -621,7 +621,7 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
//经营性支出改变
|
||||
$(".input-changeable-project-manage-cost-budget-plan").change(function () {
|
||||
var projectManageCost = f2($(this).val());
|
||||
//找到对应的设备支出、工程支出、保证金支出
|
||||
//找到对应的设备支出、工程支出、保证金付款
|
||||
var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val());
|
||||
var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val());
|
||||
var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val());
|
||||
|
|
@ -639,14 +639,14 @@ function bindChangeableInputBudgetPlanDetail() {
|
|||
//保证金改变
|
||||
$(".input-changeable-earnest-money-cost-budget-plan").change(function () {
|
||||
var earnestMoneyCost = f2($(this).val());
|
||||
//找到对应的设备支出、经营性支出、保证金支出
|
||||
//找到对应的设备支出、经营性支出、保证金付款
|
||||
var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val());
|
||||
var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val());
|
||||
var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val());
|
||||
|
||||
//更新本月所有项支出
|
||||
$(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost));
|
||||
//更新所有月保证金支出总额
|
||||
//更新所有月保证金付款总额
|
||||
updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-earnest-money-cost-budget-plan");
|
||||
updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-title-earnest-money-cost-budget-plan");
|
||||
//更新所有月支出总额
|
||||
|
|
|
|||
|
|
@ -852,7 +852,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div style="text-align:left">
|
||||
<button type="button" class="am-btn am-btn-default">
|
||||
<label class="file-label" for="file_upload_icon"
|
||||
style="margin: 0;cursor: pointer"><span
|
||||
|
|
@ -860,7 +860,7 @@
|
|||
</button>
|
||||
<span id="collaboratorUrl_check" style="margin-left: 5px;cursor: pointer"
|
||||
onclick="downFile()" fileUrl="${projectBudget.incomeDetailAttr}">
|
||||
${projectBudget.incomeDetailAttr}
|
||||
${projectBudget.incomeDetailAttrName}
|
||||
</span>
|
||||
</div>
|
||||
<div class="fixed-table has-actions">
|
||||
|
|
@ -1114,15 +1114,15 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div style="text-align:left">
|
||||
<button type="button" class="am-btn am-btn-default">
|
||||
<label class="file-label" for="file_upload_icon"
|
||||
style="margin: 0;cursor: pointer"><span
|
||||
class="am-icon-download"></span>销售合同配置清单</label>
|
||||
class="am-icon-download"></span>采购合同配置清单</label>
|
||||
</button>
|
||||
<span id="collaboratorUrl_check" style="margin-left: 5px;cursor: pointer"
|
||||
<span id="collaboratorUrl_check2" style="margin-left: 5px;cursor: pointer"
|
||||
onclick="downFile2()" fileUrl="${projectBudget.costDetailAttr}">
|
||||
${projectBudget.costDetailAttr}
|
||||
${projectBudget.costDetailAttrName}
|
||||
</span>
|
||||
</div>
|
||||
<div class="fixed-table has-actions">
|
||||
|
|
|
|||
|
|
@ -428,8 +428,12 @@
|
|||
<input name="projectId" id="projectId" type="hidden" value="${projectBudget.projectId}"/>
|
||||
<input name="incomeDetailAttr" id="incomeDetailAttr" type="hidden"
|
||||
value="${projectBudget.incomeDetailAttr}"/>
|
||||
<input name="incomeDetailAttrName" id="incomeDetailAttrName" type="hidden"
|
||||
value="${projectBudget.incomeDetailAttrName}"/>
|
||||
<input name="costDetailAttr" id="costDetailAttr" type="hidden"
|
||||
value="${projectBudget.costDetailAttr}"/>
|
||||
<input name="costDetailAttrName" id="costDetailAttrName" type="hidden"
|
||||
value="${projectBudget.costDetailAttrName}"/>
|
||||
|
||||
<!--验证表单元素（validate) begin-->
|
||||
<table id="myTable" class="am-table am-table-bordered">
|
||||
|
|
@ -885,7 +889,7 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div style="text-align:left">
|
||||
<button type="button" class="am-btn am-btn-default">
|
||||
<label class="file-label" for="file_upload_icon"
|
||||
style="margin: 0;cursor: pointer"><span class="am-icon-upload"></span>销售合同配置清单</label>
|
||||
|
|
@ -893,7 +897,7 @@
|
|||
<input id="file_upload_icon" type="file" accept=".xls,.xlsx" style="display:none;">
|
||||
<span id="collaboratorUrl_check" style="margin-left: 5px;cursor: pointer"
|
||||
onclick="downFile()" fileUrl="${projectBudget.incomeDetailAttr}">
|
||||
${projectBudget.incomeDetailAttr}
|
||||
${projectBudget.incomeDetailAttrName}
|
||||
</span>
|
||||
</div>
|
||||
<div class="fixed-table has-actions" style="max-height: calc(100% - 110px)">
|
||||
|
|
@ -1107,18 +1111,19 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div style="text-align:left">
|
||||
<button type="button" class="am-btn am-btn-default">
|
||||
<label class="file-label" for="file_upload_icon2"
|
||||
style="margin: 0;cursor: pointer"><span class="am-icon-upload"></span>销售合同配置清单</label>
|
||||
style="margin: 0;cursor: pointer"><span class="am-icon-upload"></span>采购合同配置清单</label>
|
||||
</button>
|
||||
<input id="file_upload_icon2" type="file" accept=".xls,.xlsx" style="display:none;">
|
||||
<span id="collaboratorUrl_check2" style="margin-left: 5px;cursor: pointer"
|
||||
onclick="downFile2()" fileUrl="${projectBudget.costDetailAttr}">
|
||||
${projectBudget.costDetailAttr}
|
||||
${projectBudget.costDetailAttrName}
|
||||
</span>
|
||||
</div>
|
||||
<div class="fixed-table has-actions is-vertical-scroll" style="max-height: calc(100% - 110px)">
|
||||
<div class="fixed-table has-actions is-vertical-scroll"
|
||||
style="max-height: calc(100% - 110px)">
|
||||
<table class="am-table am-table-bordered am-table-radius table-main"
|
||||
style="padding:0;" id="costTable">
|
||||
<thead style="display:block;width: 1810px;">
|
||||
|
|
@ -1177,7 +1182,7 @@
|
|||
</option>
|
||||
<option value="自定义">自定义</option>
|
||||
</select>
|
||||
<input <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'>type="text"
|
||||
<input <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'&&costDetail.category>type="text"
|
||||
<#else>type="hidden"</#if>
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
|
||||
value="${costDetail.category!}">
|
||||
|
|
@ -1316,51 +1321,53 @@
|
|||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">
|
||||
<#if costProjectManageDetail.type == 1>
|
||||
<option value="1"
|
||||
<#if costProjectManageDetail.name! == "人工费">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "1">selected</#if>>
|
||||
人工费
|
||||
</option>
|
||||
<option value="2"
|
||||
<#if costProjectManageDetail.name! == "总部支撑人力费用">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "2">selected</#if>>
|
||||
总部支撑人力费用
|
||||
</option>
|
||||
<option value="3"
|
||||
<#if costProjectManageDetail.name! == "自定义">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "3">selected</#if>>
|
||||
自定义
|
||||
</option>
|
||||
</#if>
|
||||
<#if costProjectManageDetail.type == 2>
|
||||
<option value="4"
|
||||
<#if costProjectManageDetail.name! == "人员差旅费">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "4">selected</#if>>
|
||||
人员差旅费
|
||||
</option>
|
||||
<option value="5"
|
||||
<#if costProjectManageDetail.name! == "业务费用">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "5">selected</#if>>
|
||||
业务费用
|
||||
</option>
|
||||
<option value="6"
|
||||
<#if costProjectManageDetail.name! == "商务及专项验收费用">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "6">selected</#if>>
|
||||
商务及专项验收费用
|
||||
</option>
|
||||
<option value="7"
|
||||
<#if costProjectManageDetail.name! == "办公费用">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "7">selected</#if>>
|
||||
办公费用
|
||||
</option>
|
||||
<option value="8"
|
||||
<#if costProjectManageDetail.name! == "自定义">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "8">selected</#if>>
|
||||
自定义
|
||||
</option>
|
||||
</#if>
|
||||
<#if costProjectManageDetail.type == 4>
|
||||
<option value="9"
|
||||
<#if costProjectManageDetail.name! == "保证金">selected</#if>>
|
||||
<#if costProjectManageDetail.name! == "9">selected</#if>>
|
||||
保证金
|
||||
</option>
|
||||
</#if>
|
||||
</select>
|
||||
<input <#if costProjectManageDetail.isDiy==1>type="text"
|
||||
<#else>type="hidden"</#if>
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2"
|
||||
value="${costProjectManageDetail.name!}">
|
||||
class="am-modal-prompt-input
|
||||
am-modal-prompt-input-cost-project-manage
|
||||
am-modal-prompt-input-cost-project-manage-category2"
|
||||
value="${costProjectManageDetail.name}">
|
||||
</td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
|
|
@ -2468,6 +2475,8 @@
|
|||
//设置服务器返回的url
|
||||
$("#collaboratorUrl_check2").text(data.result.data.newName).attr('fileUrl', data.result.data.url);
|
||||
$("#costDetailAttr").val(data.result.data.url)
|
||||
$("#costDetailAttrName").val(data.result.data.newName)
|
||||
|
||||
|
||||
// console.log("collboratorUrl: " + $("#collaboratorUrl").val());
|
||||
setTimeout(function () {
|
||||
|
|
@ -2529,6 +2538,8 @@
|
|||
$("#collaboratorUrl_check").text(data.result.data.newName).attr('fileUrl', data.result.data.url);
|
||||
// console.log("collboratorUrl: " + $("#collaboratorUrl").val());
|
||||
$("#incomeDetailAttr").val(data.result.data.url)
|
||||
$("#incomeDetailAttrName").val(data.result.data.newName)
|
||||
|
||||
|
||||
setTimeout(function () {
|
||||
progressArea.addClass("am-hide");
|
||||
|
|
@ -2572,6 +2583,7 @@
|
|||
if (url)
|
||||
location.href = url
|
||||
}
|
||||
|
||||
function downFile2() {
|
||||
var url = $('#collaboratorUrl_check2').attr('fileUrl')
|
||||
if (url)
|
||||
|
|
|
|||
Loading…
Reference in New Issue