From 2bb2ec7bb9d2989bbb3b7d6de2d1228c3c4af609 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 25 八月 2021 08:55:23 +0800
Subject: [PATCH] 合并
---
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 88 ++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 56 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index e03c053..6e67cdb 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -152,33 +152,25 @@
break;
};
});
- //#endregion
-
- //#region 鏌ヨ鎸夐挳
+ //鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
- //#endregion
-
- //#region 閲嶇疆鎸夐挳
+ //缃寜閽�
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
- //#endregion
-
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- //#region 鍒濆鍖栫晫闈�
+ //鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_Display(sWhere);
}
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍兼柟娉�
+ //鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -189,49 +181,45 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+ , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
- , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+ , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200}
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
, { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
- , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+ , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 200 }
, { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
, { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
, { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
- , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200}
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200}
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+ , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
]]
};
}
- //#endregion
-
- //#region 鏌ヨ
+ //鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -254,9 +242,7 @@
}
});
}
- //#endregion
-
- //#region 鏂板
+ //鏂板
function set_AddNew() {
layer.open({
type: 2,
@@ -276,9 +262,7 @@
}
});
}
- //#endregion
-
- //#region 缂栬緫
+ //缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -307,9 +291,7 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
- //#endregion
-
- //#region 鍒犻櫎
+ //鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -347,9 +329,7 @@
}
}
- //#endregion
-
- //#region 蹇�熻繃婊�
+ //蹇�熻繃婊�
function get_FastQuery() {
var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -371,9 +351,7 @@
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
- //#endregion
-
- //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ //閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HBillType").val("");//鍗曟嵁绫诲瀷
$("#HBillNo").val("");//鍗曟嵁鍙�
@@ -383,9 +361,7 @@
$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
sWhere = "";
}
- //#endregion
-
- //#region 鍒锋柊
+ //鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
--
Gitblit v1.9.1