From 645f854d105381947ecf39504877eb631ad71b4b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期日, 27 四月 2025 08:20:09 +0800
Subject: [PATCH] 三升排产微调
---
WebTM/WebTM.csproj.user | 2 +-
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 33 ++++++++-------------------------
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatFormImport_SS.html | 6 +++---
3 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 444fdd2..980f848 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
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 6141465..459c54f 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"
@@ -23,7 +23,7 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">瀹屽伐鏃ユ湡瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">浜ゆ湡瀵煎叆</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
@@ -1659,11 +1659,12 @@
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text', filter: true, sort: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });//0
+ //0
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});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
@@ -1677,7 +1678,7 @@
for (var i = 0; i < HArrangeProductDayQty; i++) {
columns.push(dateColumns[i]);//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 });
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
@@ -1692,7 +1693,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, filter: true, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1712,7 +1713,7 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, filter: true });//0
- columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+ columns.push({ fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
elem: '#mainTable'
@@ -1831,11 +1832,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
- }
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+ get_Display_2(HinterID_S);
}
} else {
@@ -4564,20 +4561,6 @@
})
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 2; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);$("#ColName1").empty();
- $("#ColName1").append(Organization);$("#ColName2").empty();
- $("#ColName2").append(Organization);
- form.render('select');
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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_DayPlanPlatFormImport_SS.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_DayPlanPlatFormImport_SS.html"
index f55a3cf..10a2573 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_DayPlanPlatFormImport_SS.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_DayPlanPlatFormImport_SS.html"
@@ -178,8 +178,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- setSelect_HInitTimeCycle();
+ //鍒濆鍖栨椂闂�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
}
@@ -231,6 +231,7 @@
var HDataSub = [];
var index = layer.load();
+ layer.msg("寮�濮嬪鍏�");
//JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
for (var i = 0; i < option.data.length; i += 100) {
HDataSub = option.data.slice(i, i + 100)
@@ -239,7 +240,6 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(HDataSub);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- var index = layer.load();
$.ajax({
type: "POST",
--
Gitblit v1.9.1