From 3a975df5b368bc68ee7a81d34920b209f2ff607b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 26 五月 2025 16:12:08 +0800
Subject: [PATCH] 提交
---
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
index 9920f98..eba3c08 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
@@ -191,6 +191,7 @@
html += " <option value='4' >" + gongyi + " 4 绾�</option>";
} else if (gongyi == "鍐峰姞宸�") {
html += " <option value='3' >" + gongyi + " 3 绾�</option>";
+ html += " <option value='4' >" + gongyi + " 4 绾�</option>";
}
document.getElementById("rf_chanxian").innerHTML += html;
@@ -696,13 +697,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][6];
- zMj+=d[i][1]*d[i][2]*d[i][6];
+ //zMj+=d[i][1]*d[i][2]*d[i][6];
d[i][7]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000);
- //zMj+=d[i][7]=d[i][1]*d[i][2]*d[i][6];
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000));
+
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
@@ -720,12 +723,15 @@
for(i=0;i<d.length;i++){
d[i][0] = i+1;
zSl+=d[i][5];
- zMj+=d[i][1]*d[i][2]*d[i][5];
+ //zMj+=d[i][1]*d[i][2]*d[i][5];
+
d[i][6]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000);
+ zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000));
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
--
Gitblit v1.8.0