From 4e2f1038ed8d48a057e3a44e0d9a223dca993179 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 07 五月 2025 16:11:38 +0800
Subject: [PATCH] 排产页面调整
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 70 ++++++++++++++++++++++-------------
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 5 +-
2 files changed, 46 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 71e5d01..79bd212 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -218,8 +218,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
//鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
- addSWhereByOpenType();
- get_Display(sWhere);
+ get_FastQuery();
//#endregion
@@ -999,7 +998,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
var DeptName = params[params[2]];
- if (openType != "undefined") {
+ if (typeof (openType) != "undefined") {
sWhere += " and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' ";
DeptName = decodeURI(DeptName);//瀵筓RI 杩涜瑙ｇ爜
if (DeptName != "undefined") {
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 440d099..32ae8b2 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"
@@ -27,7 +27,7 @@
<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>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
@@ -303,13 +303,14 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<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_ReadyWorkQty"><i class="layui-icon layui-icon-delete"></i>鍑嗗(鍚屾浜ц兘)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><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>
@@ -349,6 +350,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: '../ext/soulTable'
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
@@ -584,6 +586,16 @@
//鍑嗗鎺掑簭
case 'set_ReadyAsc':
set_ReadyAsc();
+ break;
+ //鍑嗗鍚屾浜ц兘
+ case 'set_ReadyWorkQty':
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnReady(data);
+ layer.close(index);
+ }
+ })
break;
//閫変骇绾�
case 'set_Souce':
@@ -1025,10 +1037,10 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Gy_Department/list',
+ url: GetWEBURL() + '/Gy_Department/cx',
type: "GET",
async: false,
- data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ data: { "HInterID": HWorkShopID },
success: function (data1) {
if (data1.count == 1) {
$("#HWorkShopID").val(HWorkShopID);
@@ -1060,7 +1072,7 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery(1);
+ get_FastQuery(2);
get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
@@ -1762,17 +1774,17 @@
}
, done: function (res, page, count) {
soulTable.render(this);
- $('.layui-table thead').on('click', 'th', function () {
- // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
- var field = $(this).data('field');
- set_InitGrid1(field);
- sWhere = {
- HORGID: sessionStorage["OrganizationID"]
- , HBEGINDATE: field
- , HENDDATE: field
- }
- //get_Display_3(JSON.stringify(sWhere));
- });
+ //$('.layui-table thead').on('click', 'th', function () {
+ // // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
+ // var field = $(this).data('field');
+ // set_InitGrid1(field);
+ // sWhere = {
+ // HORGID: sessionStorage["OrganizationID"]
+ // , HBEGINDATE: field
+ // , HENDDATE: field
+ // }
+ // //get_Display_3(JSON.stringify(sWhere));
+ //});
//res.data.forEach(function (item, index) {
// if (data1.data.DataColor != undefined) {
// var sj = data1.data.DataColor;
@@ -2574,10 +2586,10 @@
//鍑嗗
- function get_btnReady() {
- var data = table.cache["mainTable"];
+ function get_btnReady(data) {
+ /*var data = table.cache["mainTable"];*/
var HTotalDataList = [[]];
-
+ var ajaxData;
var index = 0;
var countEveryGroup = 50;
for (var i = 0; i < data.length; i++) {
@@ -2585,7 +2597,8 @@
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
if (isNaN(data[i]["HSourceID"])) {
- return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ data[i]["HSourceID"] = 0
+ /*return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")*/
}
if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
@@ -2605,22 +2618,26 @@
HICOMNum = HTotalDataList[t];
$.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData_SS',
async: false,
type: "GET",
data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
+ ajaxData = data1.data;
for (var i = 0; i < data1.data.length; i++) {
for (var j = 0; j < option.data.length; j++) {
if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
+ option.data[j]["HSourceID"] = data1.data[i]["HSourceID"];
+ option.data[j]["鐢熶骇璧勬簮"] = data1.data[i]["鐢熶骇璧勬簮"];
option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
+
break;
}
}
@@ -2670,10 +2687,10 @@
}
table.render(option);
- set_Priority();
- data = table.cache["mainTable"];
- for (var i = 0; i < data.length; i++) {
- if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ /*set_Priority();*/
+ /*data = table.cache["mainTable"];*/
+ for (var i = 0; i < ajaxData.length; i++) {
+ if (parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == null || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == undefined) {
msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
}
@@ -3651,7 +3668,8 @@
if (num >= data.length) {
break;
}
- if (option.data[i]["LAY_CHECKED"] == true) {
+ if ($.grep(data, function (item) {
+ return item.hmainid === option.data[i].hmainid;}).length > 0) {
option.data[i]["HSourceID"] = OptionData[0].HItemID;
option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
num += 1;
--
Gitblit v1.9.1