From 708b6629851ed5842134fe3a64ce9b3439866cc3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 22 十月 2024 13:56:01 +0800
Subject: [PATCH] 工艺路线关闭其它功能
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 129 ++++++++++++++++++++++++++++++++++++------
1 files changed, 110 insertions(+), 19 deletions(-)
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_RoutingBillList.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_RoutingBillList.html"
index 52550df..95e4e87 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_RoutingBillList.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_RoutingBillList.html"
@@ -203,6 +203,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>鍚敤榛樿</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>绂佺敤鍏跺畠</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
@@ -303,6 +304,9 @@
break;
//鍚敤榛樿
case 'set_defaultRoute': set_defaultRoute();
+ break;
+ //绂佺敤鍏跺畠
+ case 'set_closeOtherRoute': set_closeOtherRoute();
break;
//鍙戣捣瀹℃壒
case 'set_startCheckBill': set_startCheckBill();
@@ -554,6 +558,8 @@
});
option.data = layui.table.cache["mainTable"];
table.render(option);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
});
//#endregion
@@ -858,8 +864,8 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
- //浠庡埆鐨勯〉闈㈡墦寮�浼犲叆Hmaterid鍊硷紝璁剧疆鐗╂枡杩囨护
- sWhere += " and HMaterID = " + HMaterID;
+ //浠庡埆鐨勯〉闈㈡墦寮�浼犲叆Hmaterid鍊硷紝璁剧疆鐗╂枡杩囨护,鏈叧闂�
+ sWhere += " and HMaterID = " + HMaterID + " and 鍏抽棴浜�=''''";
} else {
//涓嶆槸浠庡埆鐨勯〉闈㈡墦寮�
var HMaterID2 = $("#HMaterID").val();
@@ -924,27 +930,21 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ } else {
switch (data[i].Type) {
//int
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
}
@@ -952,8 +952,30 @@
option.cols = [col];
option.data = data1.data;
-
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < option.cols[0].length; i++) {
+ colList.push(option.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ option.data = result;
laypage.render(optionPage);
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -1211,6 +1233,64 @@
}
}
+ //#region 鍏抽棴鍏跺畠
+ function set_closeOtherRoute() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid.toString();
+ var HName = data[0]["宸ヨ壓鍚嶇О"].toString();
+ var HMaterID = data[0]["HMaterID"].toString();
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '浼氬叧闂殑鍗曟嵁鍒楄〃璇风‘璁�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCloseList.html?HMaterID=' + HMaterID + '&HProID=' + 0 + '&HName=' + HName + '&HInterID=' + hmainid
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Routing/CloseOther',
+ type: "GET",
+ data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(index);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+
+ }
+ });
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ ,end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
//瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1335,6 +1415,17 @@
url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
+ var data = option.data
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
if (result.count == 1) {
table.exportFile(ins.config.id, option.data, "xls");
} else {
@@ -1711,9 +1802,9 @@
}
}
}
- table.render(option);
+ ins=table.render(option);
} else {
- table.render(option);
+ ins=table.render(option);
}
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
--
Gitblit v1.9.1