Merge remote-tracking branch 'origin/master'
commit
ccd379d545
|
@ -264,6 +264,7 @@ $(function () {
|
|||
updateCostProjectManageDataUnsubmit(dataManageCheck);
|
||||
|
||||
var dataPlan = collectData("am-modal-prompt-input-budget-plan-detail");
|
||||
console.log("dataPaln: " + dataPlan.length);
|
||||
if (dataPlan.length <= 1) {
|
||||
window.confirm('请填写项目资金计划表');
|
||||
$("#saveApprove").attr('disabled', false);
|
||||
|
@ -652,7 +653,7 @@ function convertDetailVerify(data, detailProperty) {
|
|||
var arr = arrayToMatrix(data, detailPropertyArr.length);
|
||||
var details = [];
|
||||
for (var i = 0; i < arr.length; i++) {
|
||||
if (i === arr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL2) {
|
||||
if (i === arr.length - 1 && detailProperty !== BUDGET_PLAN_DETAIL2 && detailProperty !== BUDGET_PLAN_DETAIL) {
|
||||
continue;
|
||||
}
|
||||
var obj = arr2ObjectVerify(i, arr[i], detailPropertyArr, detailProperty);
|
||||
|
|
Loading…
Reference in New Issue