分数回显错误显示
This commit is contained in:
parent
bfeb9af0fe
commit
def4717a09
|
|
@ -154,6 +154,7 @@
|
||||||
su.id_card like concat('%',#{keyWord},'%')
|
su.id_card like concat('%',#{keyWord},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
order by su.username
|
||||||
</select>
|
</select>
|
||||||
<select id="getPerSonByPhone" resultType="java.lang.Integer">
|
<select id="getPerSonByPhone" resultType="java.lang.Integer">
|
||||||
select count(1)
|
select count(1)
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
soulTable: 'excel', // 模块
|
soulTable: 'excel', // 模块
|
||||||
});
|
});
|
||||||
let headerRows;
|
let headerRows;
|
||||||
let layer, laydate, table,excel;
|
let layer, laydate, table, excel;
|
||||||
let tableLoading;
|
let tableLoading;
|
||||||
let code = 0;
|
let code = 0;
|
||||||
let tableIns = null;
|
let tableIns = null;
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
let tableCode = 1;
|
let tableCode = 1;
|
||||||
$(function () {
|
$(function () {
|
||||||
|
|
||||||
layui.use(['layer', 'laydate', 'table','excel'], function () {
|
layui.use(['layer', 'laydate', 'table', 'excel'], function () {
|
||||||
layer = layui.layer;
|
layer = layui.layer;
|
||||||
laydate = layui.laydate;
|
laydate = layui.laydate;
|
||||||
table = layui.table;
|
table = layui.table;
|
||||||
|
|
@ -446,21 +446,16 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//计算小计
|
//计算小计
|
||||||
// if (twoLevelCountType === '最高分') {
|
if (subArr.length > 0) {
|
||||||
// subTotals = Math.max(...subArr);
|
if (twoLevelCountType === '最高分') {
|
||||||
// } else if (twoLevelCountType === '平均分') {
|
subTotals = Math.max(...subArr).toFixed(2);
|
||||||
// subTotals = (subArr.reduce((prev, curr) => {
|
} else if (twoLevelCountType === '平均分') {
|
||||||
// return prev + curr;
|
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
||||||
// }, 0) / subArr.length).toFixed(2);
|
} else if (twoLevelCountType === '最低分') {
|
||||||
// } else if (twoLevelCountType === '最低分') {
|
subTotals = Math.min(...subArr).toFixed(2);
|
||||||
// subTotals = Math.min(...subArr);
|
}
|
||||||
// }
|
} else {
|
||||||
if (twoLevelCountType === '最高分') {
|
subTotals = "0.00";
|
||||||
subTotals = Math.max(...subArr).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '平均分') {
|
|
||||||
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '最低分') {
|
|
||||||
subTotals = Math.min(...subArr).toFixed(2);
|
|
||||||
}
|
}
|
||||||
itemData[item + '-subtotal'] = subTotals;
|
itemData[item + '-subtotal'] = subTotals;
|
||||||
subTotals = 0;
|
subTotals = 0;
|
||||||
|
|
|
||||||
|
|
@ -56,15 +56,15 @@
|
||||||
if (data[i].isApprove == '0') {
|
if (data[i].isApprove == '0') {
|
||||||
btn =
|
btn =
|
||||||
`<button class="layui-btn layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','0')">${data[i].name}评价审批</button>`;
|
`<button class="layui-btn layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','0')">${data[i].name}评价审批</button>`;
|
||||||
}else if (data[i].isApprove == '1') {
|
} else if (data[i].isApprove == '1') {
|
||||||
btn =
|
btn =
|
||||||
`<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
|
`<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
|
||||||
}else if (data[i].isApprove == '2') {
|
} else if (data[i].isApprove == '2') {
|
||||||
btn =
|
btn =
|
||||||
`<button class="layui-btn layui-btn-primary layui-border-red layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','2')">${data[i].name}</button>`;
|
`<button class="layui-btn layui-btn-primary layui-border-red layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','2')">${data[i].name}</button>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (localStorage.getItem("AllAuditTitle") === '查看'){
|
if (localStorage.getItem("AllAuditTitle") === '查看') {
|
||||||
btn =
|
btn =
|
||||||
`<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
|
`<button class="layui-btn layui-btn-primary layui-border layui-btn-sm" onclick="openPage('${data[i].id}', '${data[i].name}','1')">${data[i].name}</button>`;
|
||||||
}
|
}
|
||||||
|
|
@ -245,21 +245,16 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//计算小计
|
//计算小计
|
||||||
// if (twoLevelCountType === '最高分') {
|
if (subArr.length > 0) {
|
||||||
// subTotals = Math.max(...subArr);
|
if (twoLevelCountType === '最高分') {
|
||||||
// } else if (twoLevelCountType === '平均分') {
|
subTotals = Math.max(...subArr).toFixed(2);
|
||||||
// subTotals = (subArr.reduce((prev, curr) => {
|
} else if (twoLevelCountType === '平均分') {
|
||||||
// return prev + curr;
|
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
||||||
// }, 0) / subArr.length).toFixed(2);
|
} else if (twoLevelCountType === '最低分') {
|
||||||
// } else if (twoLevelCountType === '最低分') {
|
subTotals = Math.min(...subArr).toFixed(2);
|
||||||
// subTotals = Math.min(...subArr);
|
}
|
||||||
// }
|
} else {
|
||||||
if (twoLevelCountType === '最高分') {
|
subTotals = "0.00";
|
||||||
subTotals = Math.max(...subArr).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '平均分') {
|
|
||||||
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '最低分') {
|
|
||||||
subTotals = Math.min(...subArr).toFixed(2);
|
|
||||||
}
|
}
|
||||||
itemData[item + '-subtotal'] = subTotals;
|
itemData[item + '-subtotal'] = subTotals;
|
||||||
subTotals = 0;
|
subTotals = 0;
|
||||||
|
|
@ -336,7 +331,7 @@
|
||||||
});
|
});
|
||||||
if (typeof value === 'number') {
|
if (typeof value === 'number') {
|
||||||
itemData[totalField] = t.toFixed(2);
|
itemData[totalField] = t.toFixed(2);
|
||||||
}else {
|
} else {
|
||||||
itemData[totalField] = t;
|
itemData[totalField] = t;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -345,7 +340,7 @@
|
||||||
})
|
})
|
||||||
//计算总得分
|
//计算总得分
|
||||||
layui.each(res.data, function (i, itemData) {
|
layui.each(res.data, function (i, itemData) {
|
||||||
//对每一行所有total结尾的进行加和
|
//对每一行所有total结尾的进行加和
|
||||||
let map = {};
|
let map = {};
|
||||||
for (let key in itemData) {
|
for (let key in itemData) {
|
||||||
map[key] = itemData[key];
|
map[key] = itemData[key];
|
||||||
|
|
@ -530,7 +525,7 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function openPage(id, name,type) {
|
function openPage(id, name, type) {
|
||||||
let url = './otherEvaluateAuditForm.html?deptId=' + id + '&evaluateId=' + getUrlParam('evaluateId') +
|
let url = './otherEvaluateAuditForm.html?deptId=' + id + '&evaluateId=' + getUrlParam('evaluateId') +
|
||||||
'&templateId=' + getUrlParam('templateId') + '&type=' + type;
|
'&templateId=' + getUrlParam('templateId') + '&type=' + type;
|
||||||
if (id == '0') {
|
if (id == '0') {
|
||||||
|
|
|
||||||
|
|
@ -257,21 +257,16 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//计算小计
|
//计算小计
|
||||||
/* if (twoLevelCountType === '最高分') {
|
if (subArr.length > 0){
|
||||||
subTotals = Math.max(...subArr);
|
if (twoLevelCountType === '最高分') {
|
||||||
} else if (twoLevelCountType === '平均分') {
|
subTotals = Math.max(...subArr).toFixed(2);
|
||||||
subTotals = (subArr.reduce((prev, curr) => {
|
} else if (twoLevelCountType === '平均分') {
|
||||||
return prev + curr;
|
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
||||||
}, 0) / subArr.length).toFixed(2);
|
} else if (twoLevelCountType === '最低分') {
|
||||||
} else if (twoLevelCountType === '最低分') {
|
subTotals = Math.min(...subArr).toFixed(2);
|
||||||
subTotals = Math.min(...subArr);
|
}
|
||||||
}*/
|
}else {
|
||||||
if (twoLevelCountType === '最高分') {
|
subTotals = "0.00";
|
||||||
subTotals = Math.max(...subArr).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '平均分') {
|
|
||||||
subTotals = (subArr.reduce((a, b) => a + b, 0) / subArr.length).toFixed(2);
|
|
||||||
} else if (twoLevelCountType === '最低分') {
|
|
||||||
subTotals = Math.min(...subArr).toFixed(2);
|
|
||||||
}
|
}
|
||||||
itemData[item + '-subtotal'] = subTotals;
|
itemData[item + '-subtotal'] = subTotals;
|
||||||
subTotals = 0;
|
subTotals = 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue