From 277a39e1a69b6bf024721a18f4b5aa9bb1271a83 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 21 四月 2025 08:10:39 +0800
Subject: [PATCH] 三升排产页面列细节修改，齐套报表修改，欠料报表添加字体变红标记
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 13 +++++++------
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 1 +
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 3 ++-
WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysisReport.html | 20 +++++++++++++++++++-
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 7b880d8..4a2972e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -32,8 +32,8 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">閿佸畾鐢宠</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">瑙ｉ攣鐢宠</button>-->
- <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">娆犳枡杩愮畻</button>-->
@@ -1395,7 +1395,6 @@
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
- columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
@@ -1415,7 +1414,7 @@
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
- columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
+ columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, filter: true, sort: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
@@ -1425,6 +1424,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150 });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
+ columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -2470,7 +2470,8 @@
HPlanDay = data1.data[0].DayNum;
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ //layer.alert(data1.code + data1.Message, { icon: 5 });鍘绘帀鏃犵敤鎻愮ず
+
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -2522,7 +2523,7 @@
//鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
lMainID = option.data[i]["HICMOInterID"];
sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
- dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
+ dEndDate = Format(option.data[i]["璁″垝缁撴潫鏃ユ湡"], 'yyyy/MM/dd');
sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
sPlanQty = option.data[i]["鎷嗗崟鏁伴噺"];
lHGroupID = option.data[i]["HGroupID"];
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 013949e..d66cd14 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -650,7 +650,8 @@
item[itemobj] = "";
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
- item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
index b7f7e2a..51df9ce 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
@@ -526,7 +526,25 @@
}
});
} else if (isValidDate(data[i].name)) {
- col.push({ field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true })
+ col.push({
+ field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true, templet: function (d) {
+ //鑾峰彇褰撳墠浠婂ぉ鏄庡ぉ鍚庡ぉ涓夊ぉ鐨勬棩鏈熷瓧绗︿覆
+ const dates = [];
+ const today = new Date();
+ for (let i = 0; i < 3; i++) {
+ const date = new Date(today);
+ date.setDate(today.getDate() + i);
+ const dateStr = date.toISOString().slice(0, 10);
+ dates.push(`${dateStr}`);
+ }
+ // 濡傛灉琛屾棩鏈熷湪褰撳墠鏃ユ湡涓夊ぉ鍚庯紝鍒欏唴瀹规爣绾�
+ if (this.field == dates[0] || this.field == dates[1] || this.field == dates[2]) {
+ return '<span style="color:red">' + (d[this.field] == null ? 0 : d[this.field]) + '</span>';
+ } else {
+ return d[this.field] == null ? 0 : d[this.field]
+ }
+ }
+ })
}
else {
switch (data[i].Type) {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index 7871d93..96c5909 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -155,6 +155,7 @@
</div>
</div>
<script>
+ var params = get_UrlVars();
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
--
Gitblit v1.9.1