From 7aa1fa4ce74dbabcecffa6166f7a3fc4edab0611 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 12 二月 2025 15:00:08 +0800
Subject: [PATCH] 日计划工单（宝工优化完成）
---
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 9
WebTM/layuiadmin/SetColumn.js | 5
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 381 +++++++++++++++++++++---------------------------------
3 files changed, 158 insertions(+), 237 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 7000cd1..a1d297e 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -30,7 +30,7 @@
//#endregion
//#region 闅愯棌鍒楄缃� 娌″垎椤垫彃浠�
-function get_HideColumnNoPage(HModName, user, option, get_Display) {
+function get_HideColumnNoPage(HModName, user, option, get_FastQuery) {
var colName = "";
for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["field"] + ",";
@@ -49,7 +49,7 @@
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display();
+ get_FastQuery();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
@@ -140,6 +140,7 @@
option.cols[0][i + 1]["title"] = dataCols[4];
}
newCols[0].push(option.cols[0][i + 1]);
+ break;
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 91145fd..391ef0b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -1067,12 +1067,15 @@
//#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
+ var sWhere = "";
var params = get_UrlVars();
- var openType = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇
if (typeof (openType) != "undefined") {
- return " and 绂佺敤鏍囪 != 'Y'";
+ sWhere += " and 绂佺敤鏍囪 != 'Y'"
+ return sWhere;
}
- return "";
+ return sWhere;
}
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index b697785..32e4160 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -372,9 +373,6 @@
setSelect_HArrangeProductDayQty();
//鍒濆鍖栫晫闈�
- $(document).ready(function () {
- set_InitGrid();
- });
set_ClearBill();
//#endregion
@@ -550,7 +548,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//鍒犻櫎琛�
case 'set_DeleteBill':
@@ -700,12 +698,22 @@
//榻愬鍒嗘瀽
form.on('submit(btnCompleteSetAnalysis)', function (data) {
- get_btnCompleteSetAnalysis();
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnCompleteSetAnalysis();
+ }
+ })
})
//鎻愭枡杩愮畻
form.on('submit(btnTLYS)', function (data) {
- get_btnTLYS();
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnTLYS();
+ }
+ })
})
//鐢熶骇璁㈠崟閫夊崟
@@ -715,29 +723,39 @@
//鍑嗗
form.on('submit(btnReady)', function (data) {
- get_btnReady();
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnReady();
+ }
+ })
})
//鎺掍骇
form.on('submit(btnProPC)', function (data) {
- var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
- if (HWorkShopID == 0) {
- return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
- } else {
- var index = layer.open({
- type: 1, // page 灞傜被鍨�
- area: ['20%', '20%'],
- shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
- maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
- anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
- });
- setTimeout(function () {
- get_btnProPC(HWorkShopID);
- layer.close(index);
- }, 1000)
- }
+ layer.confirm('浣犵‘瀹氳鎵ц鎺掍骇鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+ if (HWorkShopID == 0) {
+ return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ } else {
+ var index = layer.open({
+ type: 1, // page 灞傜被鍨�
+ area: ['20%', '20%'],
+ shade: 0.6, // 閬僵閫忔槑搴�
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+ anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
+ });
+ setTimeout(function () {
+ get_btnProPC(HWorkShopID);
+ layer.close(index);
+ }, 1000)
+ }
+ }
+ })
})
//宸ヨ壓璺嚎缂栬緫
@@ -778,7 +796,13 @@
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
- get_btnLock(HWorkShopID);
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnLock(HWorkShopID);
+ }
+ })
+
}
})
@@ -789,18 +813,33 @@
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
- get_btnUnlock(HWorkShopID);
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnUnlock(HWorkShopID);
+ }
+ })
}
})
//閿佸畾宸ュ崟
form.on('submit(btnLockOrder)', function (data) {
- get_btnLockOrder();
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnLockOrder();
+ }
+ })
})
//瑙ｉ攣宸ュ崟
form.on('submit(btnUnlockOrder)', function (data) {
- get_btnUnlockOrder();
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ get_btnUnlockOrder();
+ }
+ })
})
//#region 涓嬫媺鍒楄〃鐩戝惉-鎺掍骇鏃堕棿
@@ -847,7 +886,6 @@
set_InitGrid();
get_FastQuery(1);
//闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
get_Display2(sWhere_ICMO);
layer.close(ajaxLoad);
@@ -872,8 +910,6 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
get_FastQuery(1);
- //闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
@@ -1110,26 +1146,26 @@
var myDate = new Date();
var oneday = 1000 * 60 * 60 * 24;
- columns.push({ type: 'checkbox', fixed: 'left', sort: true });
- columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿', sort: true });
- columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
- columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
- columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
- columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
- columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
- columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
- columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
- columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
+ columns.push({ type: 'checkbox', fixed: 'left'});
+ columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿'});
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true});
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150});
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;'});
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150 });
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150});
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150});
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text' });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150 });//0
+ columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
+ 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, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150 });
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺' });
- columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
@@ -1139,27 +1175,26 @@
columns.push(dateColumns[i]);//0
}
- columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
- columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
- columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150, sort: true });
- columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true });
- columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true });
- columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true });
- columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true });
- columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
- columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
- columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
- columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
- columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+ columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
+ columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
+ columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
+ columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
+ columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
+ columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>" });
+ columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150 });
+ columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150 });
+ 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 });
- columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
- columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
- columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
- columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150, sort: true });
- columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150, sort: true });
- columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
+ columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
+ columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
+ columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
+ columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
+ columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150 });
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
@@ -1171,8 +1206,8 @@
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
- columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
- columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text' });
+ columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, filter: true });//0
//columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
@@ -1282,6 +1317,8 @@
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
ins = table.render(option);
var HinterID_S = [];
for (var i = 0; i < data1.data.length; i++) {
@@ -2792,51 +2829,62 @@
//浼樺厛绾�
function set_Priority() {
- var data = table.cache["mainTable"];
- for (var i = 0; i < data.length; i++) {
- data[i]["浼樺厛绾�"] = ((i + 1) * 5);
- }
- option.data = data;
- table.render(option);
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+ }
+ option.data = data;
+ table.render(option);
+ }
+ })
}
//鍑嗗鎺掑簭
function set_ReadyAsc() {
- if (option.data.length != 0) {
- for (var i = 0; i < option.data.length - 1; i++) {
- for (var j = 0; j < option.data.length - i - 1; j++) {
- var tables = [];
- //鎸夌収璁″垝缁撴潫鏃ユ湡 鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟鏄庣粏琛屽彿鐨勯『搴忓幓鎺�
- if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] > option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
-
- tables.push(option.data[j + 1]);
- option.data[j + 1] = option.data[j];
- option.data[j] = tables[0];
-
- } else if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] == option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
- if (option.data[j]["鐢熶骇璁㈠崟鍙�"] > option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
-
- tables.push(option.data[j + 1]);
- option.data[j + 1] = option.data[j];
- option.data[j] = tables[0];
-
- } else if (option.data[j]["鐢熶骇璁㈠崟鍙�"] == option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
- if (option.data[j]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] > option.data[j + 1]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ if (option.data.length != 0) {
+ for (var i = 0; i < option.data.length - 1; i++) {
+ for (var j = 0; j < option.data.length - i - 1; j++) {
+ var tables = [];
+ //鎸夌収璁″垝缁撴潫鏃ユ湡 鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟鏄庣粏琛屽彿鐨勯『搴忓幓鎺�
+ if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] > option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
tables.push(option.data[j + 1]);
option.data[j + 1] = option.data[j];
option.data[j] = tables[0];
+ } else if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] == option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鍙�"] > option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["鐢熶骇璁㈠崟鍙�"] == option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] > option.data[j + 1]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ }
+ }
}
}
}
+ table.render(option);
+ }
+ else {
+ return layer.msg("鏃犳暟鎹�!")
}
}
- table.render(option);
- }
- else {
- return layer.msg("鏃犳暟鎹�!")
- }
+ })
+
}
//閫変骇绾�
@@ -3540,137 +3588,6 @@
else {
layer.msg('璇烽�夋嫨鏁版嵁锛�');
}
- }
-
- //闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length; i++) {
- colName += option.cols[0][i]["field"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
-
- //鏄剧ず鍒楁暟鎹�
- function DisPlay_HideColumn() {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
- titleData = [];
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
- newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
- dataCol = data1.data[0].HGridString.split(',');
- //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
- }
- newCols[0].push(option.cols[0][i + 1]);
- }
- }
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
- }
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- }
- }
- table.render(option);
- } else {
- table.render(option);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
}
function get_HideColumn_ICMO() {
--
Gitblit v1.9.1