From ead0e1939162c5daecd0b6c3e2763bfbcc3688a4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 19 十月 2022 15:22:02 +0800
Subject: [PATCH] 维护
---
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 3 ++-
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 6 +++---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 20 ++++++++++++++++++++
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 2 +-
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 6 +++---
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 6 +++---
6 files changed, 32 insertions(+), 11 deletions(-)
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/ReportPODemandPlanBillList.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/ReportPODemandPlanBillList.html"
index 2c6b381..d6abfb0 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/ReportPODemandPlanBillList.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/ReportPODemandPlanBillList.html"
@@ -196,10 +196,10 @@
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), width: 70 })//0
+ for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
}
- for (var i = 1; i <= (SumMonth - MonthCount + dd); i++) {
+ for (var i = 1; i <= dd; i++) {
columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
}
columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
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/ReportPODemandPlanBillList_S.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/ReportPODemandPlanBillList_S.html"
index 81da310..492c631 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/ReportPODemandPlanBillList_S.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/ReportPODemandPlanBillList_S.html"
@@ -195,10 +195,10 @@
columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), width: 70 })//0
+ for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
}
- for (var i = 1; i <= (SumMonth - MonthCount + dd); i++) {
+ for (var i = 1; i <= dd; i++) {
columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
}
columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
index 64c9edb..d102302 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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
@@ -178,10 +178,10 @@
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), width: 70 })//0
+ for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
+ columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
}
- for (var i = 1; i <= (SumMonth - MonthCount + dd); i++) {
+ for (var i = 1; i <= dd; i++) {
columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
}
columns.push({ field: '', title: '璁″垝鏄庣粏_鍚堣' });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index d809cb6..ea78ace 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -585,10 +585,30 @@
success: function (data1) {
if (data1.count == 1) {
if (data1.data[0]["DayNum"] > 0) {
+ //鑾峰彇琚攣瀹氱殑鍒楁暟
+ var tableNum = 0;
+ for (var i = 0; i < 31; i++) {
+ if (option.cols[0][22 + i]["edit"] == "") {
+ tableNum += 1;
+ } else {
+ break;
+ }
+ }
+
+ //鍒ゆ柇 琚攣瀹氱殑鍒楁暟 濡傛灉灏忎簬 鏁版嵁搴撲腑鏌ュ埌鐨� 闇�瑕侀攣瀹氱殑鍒楁暟 鍒欑洿鎺� 杩涜淇敼
+ //琚攣瀹氱殑鍒楁暟 澶т簬 鏁版嵁搴撲腑鏌ュ埌鐨� 闇�瑕侀攣瀹氱殑鍒楁暟 鍒� 鍏堟竻闄ら〉闈㈢殑缂撳瓨 鍐嶈繘琛屼慨鏀�
+ if (tableNum > data1.data[0]["DayNum"]) {
+ for (var i = 0; i < tableNum; i++) {
+ option.cols[0][22 + i]["edit"] = "text";
+ option.cols[0][22 + i]["style"] = "";
+ }
+ }
+
for (var i = 0; i < data1.data[0]["DayNum"]; i++) {
option.cols[0][22 + i]["edit"] = "";
option.cols[0][22 + i]["style"] = " background-color: #e6e6e6";
}
+
} else {
for (var i = 0; i < 31; i++) {
option.cols[0][22 + i]["edit"] = "text";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
index aca51aa..595a7c9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -216,7 +216,7 @@
, { field: '鎬昏鍒掓暟', title: '鎬昏鍒掓暟' }
, { field: '瀹屽伐鏁�', title: '瀹屽伐鏁�' }
, { field: '瀹屽伐鏍囪', title: '瀹屽伐鏍囪' }
- , { field: '浼樺厛绾�0', title: '浼樺厛绾�' }
+ , { field: '浼樺厛绾�', title: '浼樺厛绾�' }
]]
};
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index 50e3862..c8494b3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -236,7 +236,8 @@
, { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О' }
, { field: '浠撳簱ID', title: '浠撳簱ID', hide: true }
, { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
+ , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 120}
+ , { field: '鎵瑰彿', title: '鎵瑰彿' ,width:120}
]]
, done: function (res, curr, count) {
for (var i in res.data) {
--
Gitblit v1.9.1