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

导入完成

dev_2.0.2
‘wangjiuyun 2024-12-20 11:51:42 +08:00
parent c40ec93373
commit 4273ae4d2d
4 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,6 +393,7 @@ function checkIfFillIn() {
var signTypeBudget = $("#signTypeBudget").val();
var calculationCollectionBudget = $("#calculationCollectionBudget").val();
var resolvePlanSynergy = $("#resolvePlanSynergy").val();
if (name.length <= 0) {
window.confirm('项目名称不能为空');
@ -421,7 +422,11 @@ function checkIfFillIn() {
// return;
// }
if (!resolvePlanSynergy) {
window.confirm('解决方案协同不能为空');
check = 1;
return;
}
if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
window.confirm('垫资利息不能为空');
check = 1;

2
src/main/resources/static/assets/js/project_budget_cost.js
View File

@ -487,7 +487,7 @@ function initRowDataCost(data){
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').val('自定义')
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select')
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-name').val(data.category)
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-name').trigger('change')
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').trigger('change')
}else{
$('#costTable tbody .costaddtr:last').find('.input-changeable-tax-rate-cost-select').val(data.category)
}

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

@ -165,6 +165,7 @@
#tab3 {
overflow-x: hidden;
}
#tab34 table#budgetPlanDetailTable tbody {
/*padding-top: 15px;*/
}
@ -263,7 +264,21 @@
<input readonly value=""/>
</#if>
</td>
<td class="table-title" colspan="3">
<th class="table-title" colspan="1"><span style="font-size: 15px">解决方案协同:</span>
</th>
<td class="table-title" colspan="2">
<#if project.resolvePlanSynergy??>
<#if (project.resolvePlanSynergy)==true>
<input readonly value="是"/>
<#elseif (project.resolvePlanSynergy)==false>
<input readonly value="否"/>
<#else>
<input readonly value=""/>
</#if>
</#if>
</td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span style="font-size: 15px">垫资模式:</span></th>
@ -1407,16 +1422,20 @@
onclick="location.href='${base}/project/budgetPlanExport?id=${project.id!}'">
<span class="am-icon-archive"></span> 导出
</button>
<button type="button" class="am-btn am-btn-default openDetail" onclick="openDetail()">
<button type="button" class="am-btn am-btn-default openDetail"
onclick="openDetail()">
<span class="am-icon-archive"></span> 拓展明细
</button>
<button style="display: none" type="button" class="am-btn am-btn-default closeDetail" onclick="closeDetail()">
<button style="display: none" type="button"
class="am-btn am-btn-default closeDetail" onclick="closeDetail()">
<span class="am-icon-archive"></span> 隐藏明细
</button>
<button type="button" style="display: none" class="am-btn am-btn-default closeEmpty" onclick="closeEmpty()">
<button type="button" style="display: none"
class="am-btn am-btn-default closeEmpty" onclick="closeEmpty()">
<span class="am-icon-archive"></span> 隐藏无金额月份
</button>
<button type="button" class="am-btn am-btn-default openEmpty" onclick="openEmpty()">
<button type="button" class="am-btn am-btn-default openEmpty"
onclick="openEmpty()">
<span class="am-icon-archive"></span> 展示无金额月份
</button>
<#-- <button type="button" class="am-btn am-btn-default" onclick="printPage('tab34')">-->
@ -4135,7 +4154,9 @@
}
closeEmpty()
function openEmpty() {
$('.tr-budget-plan-empty').css('display', 'inline-block');
$('.closeEmpty').css('display', 'inline-block');
@ -4143,11 +4164,13 @@
}
$('#tab34').on('scroll', (event) => {
let top = $('#tab34').scrollTop()
let left = $('#tab34').scrollLeft()
$('#tab34 table tr td:nth-child(1)').css({'top':top>0?top-64:top,'left':left
$('#tab34 table tr td:nth-child(1)').css({
'top': top > 0 ? top - 64 : top, 'left': left
})
if (top > 0) {
$('#tab34 table#budgetPlanDetailTable tr td:nth-child(1)').css({

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

@ -517,7 +517,17 @@
</option>
</select>
</td>
<td class="table-title" colspan="3">
<th class="table-title" colspan="1"><span style="color: red;">*</span><span
style="font-size: 15px">解决方案协同:</span></th>
<td class="table-title" colspan="2">
<select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}"
id="resolvePlanSynergy" name="resolvePlanSynergy">
<option value="true" <#if projectBudget.resolvePlanSynergy==true>selected</#if>>是
</option>
<option value="false" <#if projectBudget.resolvePlanSynergy==false>selected</#if>>否
</option>
</select>
</td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1"><span style="color: red;">*</span><span
@ -2420,13 +2430,10 @@
var list = [...data.data.successList.map((ele)=> {
ele.result = ele.name + '(成功)'
return ele
}),...data.data.errorList.map((ele)=> {
ele.result = ele
return ele
})];
}),...data.data.errorList];
var content = '';
$.each(list, function (i, r) {
content += (i + 1) + '、' + r.result + '<br>';
content += (i + 1) + '、' + (r.result||r) + '<br>';
});
console.log('---> ' + content);
parent.layer.open({
@ -2475,13 +2482,10 @@
var list = [...data.data.successList.map((ele)=> {
ele.result = ele.category + '(成功)'
return ele
}),...data.data.errorList.map((ele)=> {
ele.result = ele
return ele
})];
}),...data.data.errorList];
var content = '';
$.each(list, function (i, r) {
content += (i + 1) + '、' + r.result + '<br>';
content += (i + 1) + '、' + (r.result||r) + '<br>';
});
console.log('---> ' + content);
parent.layer.open({