From b34f3d357055cc2b345564cf98abe2368f2ecc9f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 十月 2023 09:58:54 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 6 +-
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 1
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 4 +
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 49 ++++++++++++++++++++----
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 18 ++++----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 11 +++++
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 15 ++++++-
7 files changed, 81 insertions(+), 23 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\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.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\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index a43bd46..5243554 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\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.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\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -338,7 +338,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -351,8 +351,8 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HWorkShopID": checkStatus.data[0].HItemID
- , "HWorkShopNumber": checkStatus.data[0].HNumber
- , "HWorkShopName": checkStatus.data[0].HName
+ , "HWorkShopNumber": checkStatus.data[0].閮ㄩ棬浠ｇ爜
+ , "HWorkShopName": checkStatus.data[0].閮ㄩ棬鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
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 5a4e37f..869b2d9 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"
@@ -190,6 +190,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -381,6 +382,11 @@
case 'set_Priority':
set_Priority();
break;
+ //鍑嗗鎺掑簭
+ case 'set_ReadyAsc':
+ set_ReadyAsc();
+ break;
+
}
});
@@ -467,6 +473,26 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 淇敼鏃堕棿
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HPlanEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ }
+ });
+ }
+
+
+ //#endregion
});
//閿佸畾
@@ -548,7 +574,6 @@
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width:150 });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width:150 });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width:150 });
@@ -558,9 +583,10 @@
columns.push({field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150});//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>"});
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate"});
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
- columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
+
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
columns.push({
@@ -713,7 +739,9 @@
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
- columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide:true });
+ columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide: true });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option = {
@@ -979,7 +1007,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -989,7 +1017,7 @@
}
//鑾峰彇鏁版嵁
$("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
- $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
get_WriteConfigFile();
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1025,8 +1053,8 @@
function get_FastQuery(number) {
var HWorkShopID = 0;
var HProdORGID = 0;
+ HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (number == 2) {
- HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
}
@@ -1490,7 +1518,7 @@
//瓒呬氦璐ф湡 浠嶇劧鎺掔▼
for (var j = 0; j < ds.length; j++) {
//鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
+ if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) >= sLeftProdTimes) {
if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
{
//鍦ㄦ湰璧勬簮涓婄敓浜�
@@ -2053,6 +2081,11 @@
table.render(option);
}
+ //鍑嗗鎺掑簭
+ function set_ReadyAsc() {
+
+ }
+
//淇濆瓨
function set_AddNew() {
@@ -2106,7 +2139,7 @@
//var sMainStr = JSON.stringify(data.field);
var sSubStr = "["+JSON.stringify(num)+"]";
- var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
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 595a7c9..2a16324 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"
@@ -33,9 +33,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇浠诲姟鍗曞彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input" name="HICOMNo" id="HICOMNo">
</div>
</div>
<!--<div class="layui-inline">
@@ -272,7 +272,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBillNo = $("#HBillNo").val();
+ var HICOMNo = $("#HICOMNo").val();
var Organization = $("#Organization").val();//閲囪喘缁勭粐
var HWorkShopIDName = $("#HWorkShopIDName").val();//鐢熶骇杞﹂棿
var HBTimes = $("#HBTimes").val();//鏃ユ湡
@@ -281,18 +281,18 @@
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ if (HICOMNo) {
+ sWhere += " and 鐢熶骇浠诲姟鍗曞彿 like '%" + HICOMNo + "%'";
}
if (Organization) {
sWhere += " and HProdORGID = '" + Organization + "'";
}
if (HWorkShopIDName) {
- sWhere += " and 鐢熶骇杞﹂棿 = '" + HWorkShopIDName + "'";
+ sWhere += " and 閮ㄩ棬鍚嶇О = '" + HWorkShopIDName + "'";
}
- if (HBTimes != "" && HETimes != "") {
- sWhere += " and 鏃ユ湡 between '" + HBTimes + "' and '" + HETimes + "' ";
- }
+ //if (HBTimes != "" && HETimes != "") {
+ // sWhere += " and 鏃ユ湡 between '" + HBTimes + "' and '" + HETimes + "' ";
+ //}
if (HMaterName) {
sWhere += " and 鐗╂枡鍚嶇О like'%" + HMaterName + "%'";
}
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_ShopCalendar.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_ShopCalendar.html"
index 32e43ae..b83c8c2 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_ShopCalendar.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_ShopCalendar.html"
@@ -13,6 +13,12 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/grwebapp.js"></script>
<script src="../../../layuiadmin/layui/layui1.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -43,7 +49,7 @@
</div>
<div class="layui-row" style="padding:10px 0">
<div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
- <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 1200px; overflow: scroll;"></div>
</div>
<div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 83%">
<div>
@@ -473,6 +479,11 @@
elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
, data: treeTable
, click: function (obj) {
+
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
TagId = data.id;
var sql = "";
@@ -480,7 +491,7 @@
if (data.id == "0") {
sql = " and 鏃ユ湡 like'%" + HDate + "%'";
} else {
- sql = " and HSourceID='" + data.id + "' and 鏃ユ湡 like'%" + HDate+"%'";
+ sql = " and HSourceID='" + data.id + "' and (鏃ユ湡 like'%" + HDate +"%' or 鏃ユ湡 is null)";
}
get_Display(sql);
}
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 84b2259..8ce6720 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"
@@ -234,6 +234,7 @@
, { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺' }
, { field: '榻愬鐘舵��', title: '榻愬鐘舵��' }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 9ffa1dc..42627c2 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -628,6 +628,8 @@
if (HBillSubType == "SUB") {
//鏄剧ず宸ュ簭
$("#HIDDEN").show();
+ } else {
+ HBillSubType = "3301";
}
//鍒ゆ柇鏄惁鏂板
@@ -1499,7 +1501,7 @@
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "浜哄憳鍒楄〃" //鏍囬
+ , title: "宸ヤ綔涓績鍒楄〃" //鏍囬
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 81e0407..b491e70 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -1365,6 +1365,12 @@
table.render(option);
}
+ $(".laytable-cell-" + table.index + "-0-0").css({
+ "height": "25px",
+ "width": "48px;"
+ });
+
+
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
@@ -1455,6 +1461,11 @@
table.render(option2);
}
+ $(".laytable-cell-" + table.index + "-0-0").css({
+ "height": "25px",
+ "width": "48px;"
+ });
+
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
--
Gitblit v1.9.1