未完成文件上传
‘wangjiuyun
parent
122e560b21
commit
8050f16a11
|
|
@ -146,15 +146,7 @@ $(function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
dataManage = prepareAjaxDataVerify(dataManage, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
|
dataManage = prepareAjaxDataVerify(dataManage, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
|
||||||
var totalTotal=dataManage.details.reduce((total,now)=>{
|
|
||||||
return now.total+total
|
|
||||||
},0)
|
|
||||||
var projectGrossProfitA=$('[name="projectGrossProfitA"]').val()
|
|
||||||
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
|
|
||||||
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
|
|
||||||
$("#saveDraft").attr('disabled', false)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (dataManage) {
|
if (dataManage) {
|
||||||
postAjax(base + "/project/budgetEditSaveCostProjectManageDetail", dataManage);
|
postAjax(base + "/project/budgetEditSaveCostProjectManageDetail", dataManage);
|
||||||
}
|
}
|
||||||
|
|
@ -288,9 +280,15 @@ $(function () {
|
||||||
var totalTotal = dataManage.details.reduce((total, now) => {
|
var totalTotal = dataManage.details.reduce((total, now) => {
|
||||||
return now.total + total
|
return now.total + total
|
||||||
}, 0)
|
}, 0)
|
||||||
|
var limitTotal = dataManage.details.reduce((total, now) => {
|
||||||
|
if (now.type == 2 && (now.name == 5 || now.name == 4))
|
||||||
|
return now.total + total
|
||||||
|
else return total
|
||||||
|
}, 0)
|
||||||
var projectGrossProfitA = $('[name="projectGrossProfitA"]').val()
|
var projectGrossProfitA = $('[name="projectGrossProfitA"]').val()
|
||||||
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
|
if (limitTotal > ((Number(projectGrossProfitA)-(totalTotal-limitTotal)) * 0.1)) {
|
||||||
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
|
layuiAlert(`差旅费+业务费总金额不超过【毛利A(${projectGrossProfitA})-（项目管理费用-差旅费-业务费）】*10%`);
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (dataManage) {
|
if (dataManage) {
|
||||||
|
|
@ -412,8 +410,6 @@ function checkIfFillIn() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// if (projectNo.length <= 0) {
|
// if (projectNo.length <= 0) {
|
||||||
// window.confirm('项目编号不能为空');
|
// window.confirm('项目编号不能为空');
|
||||||
// check = 1;
|
// check = 1;
|
||||||
|
|
@ -428,9 +424,6 @@ function checkIfFillIn() {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
|
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
|
||||||
window.confirm('垫资利息不能为空');
|
window.confirm('垫资利息不能为空');
|
||||||
check = 1;
|
check = 1;
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ function bindOtherOtherChangeable() {
|
||||||
*/
|
*/
|
||||||
function bindTypeSelectChange() {
|
function bindTypeSelectChange() {
|
||||||
//大类变化联动类别
|
//大类变化联动类别
|
||||||
$(".input-changeable-tax-rate-income-select").on('change',function () {
|
$(".input-changeable-tax-rate-cost-select").on('change',function () {
|
||||||
var nameSelect = $(this).parent().parent().find(".input-changeable-tax-rate-cost-select");
|
var nameSelect = $(this).parent().parent().find(".input-changeable-tax-rate-cost-select");
|
||||||
var nameInput = $(this).parent().parent().find(".input-changeable-tax-rate-cost-name");
|
var nameInput = $(this).parent().parent().find(".input-changeable-tax-rate-cost-name");
|
||||||
var type = $(this).val();
|
var type = $(this).val();
|
||||||
|
|
|
||||||
|
|
@ -1133,44 +1133,27 @@
|
||||||
</option>
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td width="150px">
|
||||||
<select <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>style="display:none"</#if>
|
<select <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'>style="display:none"</#if>
|
||||||
class="am-modal-prompt-input am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category input-changeable-tax-rate-cost-select">
|
class="am-modal-prompt-input am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category input-changeable-tax-rate-cost-select">
|
||||||
<option value="华智产品"
|
<option value="华智产品"
|
||||||
<#if incomeDetail.name ="华智产品" >selected</#if>>
|
<#if costDetail.category ="华智产品" >selected</#if>>
|
||||||
华智产品
|
华智产品
|
||||||
</option>
|
</option>
|
||||||
<option value="华三产品"
|
<option value="华三产品"
|
||||||
<#if incomeDetail.name ="华三产品">selected</#if>>
|
<#if costDetail.category ="华三产品">selected</#if>>
|
||||||
华三产品
|
华三产品
|
||||||
</option>
|
</option>
|
||||||
<option value="汇智产品"
|
<option value="汇智产品"
|
||||||
<#if incomeDetail.name ="汇智产品">selected</#if>>
|
<#if costDetail.category ="汇智产品">selected</#if>>
|
||||||
汇智产品
|
汇智产品
|
||||||
</option>
|
</option>
|
||||||
<option value="自定义">自定义</option>
|
<option value="自定义">自定义</option>
|
||||||
</select>
|
</select>
|
||||||
<input <#if incomeDetail.name!='华智产品'&&incomeDetail.name!='华三产品'&&incomeDetail.name!='汇智产品'>type="text"
|
<input <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'>type="text"
|
||||||
<#else>type="hidden"</#if>
|
<#else>type="hidden"</#if>
|
||||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
|
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
|
||||||
value="${incomeDetail.name!}">
|
value="${costDetail.category!}">
|
||||||
</td>
|
|
||||||
<td width="150px">
|
|
||||||
<select style="float: left;"
|
|
||||||
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
|
|
||||||
<#--<option value="1" <#if costDetail.category == 1>selected</#if>>华智产品</option>
|
|
||||||
<option value="2" <#if costDetail.category == 2>selected</#if>>紫光其他产品</option>
|
|
||||||
<option value="3" <#if costDetail.category == 3>selected</#if>>外购产品</option>
|
|
||||||
<option value="4" <#if costDetail.category == 4>selected</#if>>外购工程</option>
|
|
||||||
<option value="5" <#if costDetail.category == 5>selected</#if>>华智服务</option>
|
|
||||||
<option value="6" <#if costDetail.category == 6>selected</#if>>紫光其他服务</option>
|
|
||||||
<option value="7" <#if costDetail.category == 7>selected</#if>>外购服务</option>
|
|
||||||
<option value="8" <#if costDetail.category == 8>selected</#if>>其他</option>-->
|
|
||||||
<#list procurementTypes as procurementType>
|
|
||||||
<option value="${procurementType.id}"
|
|
||||||
<#if costDetail.category == procurementType.id>selected</#if>>${procurementType.name}</option>
|
|
||||||
</#list>
|
|
||||||
</select>
|
|
||||||
</td>
|
</td>
|
||||||
<td width="100px"><input type="text" maxlength="5"
|
<td width="100px"><input type="text" maxlength="5"
|
||||||
class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost"
|
class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue