From f1203f1f5bf65cab36515c6873e0fefba6acebe7 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 10 七月 2024 18:18:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html | 2
WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html | 9
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 88 -
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 30
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 57 -
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBillList.html | 34
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 88 -
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 43
WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMainList.html | 175 +++
WebTM/views/基础资料/公用基础资料/Gy_InspectMethod.html | 26
WebTM/views/车间管理/产线/Gy_WorkDay.html | 148 ---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_BCP.html | 127 --
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html | 35
WebTM/views/生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html | 4
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBillList.html | 144 ++
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html | 63
WebTM/views/生产工序管理/委外工序计划汇报单/WW_EntrustProcessReportBillList.html | 592 ++++++------
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList_His.html | 11
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 73 +
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | 28
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList_Last.html | 45
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html | 9
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBillList.html | 123 ++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html | 15
WebTM/views/基础资料/公用基础资料/Gy_InspectValue.html | 32
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBillList.html | 61
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 277 -----
WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html | 237 ----
WebTM/views/品质管理/客诉处理/Crm_CustomerAppealBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 106 +-
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 87 -
31 files changed, 1,059 insertions(+), 1,712 deletions(-)
diff --git "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/Crm_CustomerAppealBillList.html" "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/Crm_CustomerAppealBillList.html"
index b5e3482..df26881 100644
--- "a/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/Crm_CustomerAppealBillList.html"
+++ "b/WebTM/views/\345\223\201\350\264\250\347\256\241\347\220\206/\345\256\242\350\257\211\345\244\204\347\220\206/Crm_CustomerAppealBillList.html"
@@ -387,7 +387,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HInterID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
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_InspectInstruMent.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_InspectInstruMent.html"
index 1fbeebb..76e2787 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_InspectInstruMent.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_InspectInstruMent.html"
@@ -304,7 +304,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '妫�楠屼华鍣ㄤ唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
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_InspectMethod.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_InspectMethod.html"
index d2c4bf5..c682f31 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_InspectMethod.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_InspectMethod.html"
@@ -29,18 +29,7 @@
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate1" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">妫�楠屾柟娉曚唬鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -320,7 +309,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '妫�楠屾柟娉曚唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -517,21 +506,14 @@
if (HName) {
sWhere += " and 妫�楠屾柟娉曞悕绉� like '%" + HName + "%'";
}
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HDate2) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
-
+
$("#HNumber").val("");
$("#HName").val("");
$("#btnSearch").click();
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_InspectValue.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_InspectValue.html"
index 0abe035..e006bed 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_InspectValue.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_InspectValue.html"
@@ -28,21 +28,7 @@
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline"
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">妫�娴嬪�间唬鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -324,7 +310,7 @@
//妫�娴嬪�间唬鐮佽秴閾炬帴
if (obj.event == '妫�娴嬪�间唬鐮�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓�
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -439,8 +425,7 @@
}
//蹇�熸煡璇�
function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -515,12 +500,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+
if (HNumber) {
sWhere += " and 妫�娴嬪�间唬鐮� like '%" + HNumber + "%'";
}
@@ -532,9 +512,7 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+
$("#HNumber").val("");
$("#HName").val("");
$("#btnSearch").click();
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_MouldType.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_MouldType.html"
index ad032d9..82515b4 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_MouldType.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_MouldType.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
@@ -35,13 +36,13 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
</div>
</div>
-
- <div class="layui-inline">
+
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -191,6 +192,7 @@
//#endregion
var titleData = ["HMouldID", "hsubid",];
+ var HModName = "Gy_MouldType";
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鏍�
set_ClearBill();
@@ -275,13 +277,13 @@
})
//#endregion
//#endregion
-
+
function set_ClearBill() {
-
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
+
//鏌ヨ
get_Display(sWhere);
ColFilter();
@@ -314,36 +316,37 @@
, { field: 'HRemark', title: '澶囨敞', width: 200, sort: true}
, { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true}
]]
+
};
}
////#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- //table.on('tool(mainTable)', function (obj) {
- // var data = obj.data;
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
- // //鍗曟嵁鍙疯秴閾炬帴
- // if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- // var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
- // //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- // layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- // type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
- // , area: ['100%', '100%']
- // , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- // , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
- // , shade: 0.6 //閬僵閫忔槑搴�
- // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + linterid + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
- // , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- // end: function () { //褰撳叧闂椂璋冪敤
- // get_FastQuery(table, option);
- // }
- // , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
- // //$(".layui-btn").removeClass("layui-btn-disabled");
- // }
- // })
- // }
- //});
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + linterid + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#endregion
//鏌ヨ
function get_Display(sWhere) {
@@ -369,13 +372,13 @@
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) { //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- //} else if (data[i].name == '鍗曟嵁鍙�') {
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
- //} 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 'DateTime':
@@ -390,7 +393,19 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , cols: [col]
+ /* , cols: [col]*/
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true, sort: true }
+ , { field: 'HParentID', title: 'HParentID', sort: true, hide: true, sort: true }
+ , { field: 'HNumber', title: '浠ｇ爜', width: 200, sort: true }
+ , { field: 'HName', title: '鍚嶇О', width: 200, sort: true }
+ , { field: 'HLevel', title: '绛夌骇', width: 200, sort: true }
+ , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true }
+ , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true }
+ , { field: 'HRemark', title: '澶囨敞', width: 200, sort: true }
+ , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
+ ]]
, data: data1.data
, height: 800
, page: true
@@ -429,7 +444,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- /* var titleData = ["HMouldID", "hsubid",];*/
+ var titleData = ["HMouldID", "hsubid",];
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -502,8 +517,7 @@
//#endregion
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
@@ -580,12 +594,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+
if (HNumber) {
sWhere += " and HNumber like '%" + HNumber + "%'";
}
@@ -599,9 +608,6 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HNumber").val("");
$("#HName").val("");
$("#ColContent").val("");
@@ -613,7 +619,7 @@
$("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
-
+
form.render('select');
sWhere = "";
get_Display(sWhere);
@@ -874,7 +880,7 @@
// , format:'yyyy-MM-dd HH:mm'
//});
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
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_WorkCenter.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_WorkCenter.html"
index 94e6d06..30f9e71 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_WorkCenter.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_WorkCenter.html"
@@ -29,25 +29,7 @@
<span>鏇村</span>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -386,43 +368,12 @@
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
- // //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- //form.on('select(HInitTimeCycle)', function (data) {
- // var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- // //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- // if (HInitTimeCycle != -1) {
- // $('#HBeginDate').prop('disabled', true);
- // $('#HEndDate').prop('disabled', true);
-
- // $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- // $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- // //鎵ц鏌ヨ鏂规硶
- // get_FastQuery(1);
- // } else {
- // $('#HBeginDate').prop('disabled', false);
- // $('#HEndDate').prop('disabled', false);
- // }
- //});
+
//#endregion
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- ////鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- //setSelect_HInitTimeCycle();
- ////鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //if (HInitTimeCycle != -1) {
- // $('#HBeginDate').prop('disabled', true);
- // $('#HEndDate').prop('disabled', true);
- //} else {
- // $('#HBeginDate').prop('disabled', false);
- // $('#HEndDate').prop('disabled', false);
- //}
-
- ////鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
Organ();
//鍒濆鍖栬〃鏍�
@@ -504,7 +455,7 @@
//瓒呴摼鎺�
if (obj.event == '宸ヤ綔涓績浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -613,8 +564,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
@@ -692,12 +642,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -721,9 +666,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+
$("#HNumber").val("");
$("#HName").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -742,22 +685,6 @@
//#endregion
- ////#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- //function setSelect_HInitTimeCycle() {
- // var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- // var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
-
- // var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
- // for (var i = 0; i < valueList.length; i++) {
- // HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
- // }
-
- // $("#HInitTimeCycle").empty();
- // $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
- // form.render('select');
- // $("#HInitTimeCycle").val("29");
- //}
- //#endregion
//#region 鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index dd9c3ec..990a448 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -30,25 +30,7 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐝粍浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -360,24 +342,6 @@
parent.layer.close(index);
});
//#endregion
- //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- form.on('select(HInitTimeCycle)', function (data) {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
-
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
- });
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -385,21 +349,6 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
Organ();
- //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- setSelect_HInitTimeCycle();
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
-
- //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -467,12 +416,12 @@
//鐝粍浠ｇ爜瓒呴摼鎺�
if (obj.event == '鐝粍浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.HDeptID
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -581,8 +530,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
- var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
@@ -659,12 +607,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -687,10 +630,7 @@
//#endregion
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
- function set_ClearQuery() {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -707,23 +647,7 @@
sWhere = "";
}
//#endregion
- //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
- var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
- for (var i = 0; i < valueList.length; i++) {
- HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
- }
-
- $("#HInitTimeCycle").empty();
- $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
- form.render('select');
-
- $("#HInitTimeCycle").val("29");
- }
- //#endregion
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Gy_Group_ExportExcel";
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_Process.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_Process.html"
index 9f7f09e..30e028d 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_Process.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_Process.html"
@@ -33,25 +33,7 @@
<span>鏇村</span>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡闂撮殧</label>
- <div class="layui-input-block">
- <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
- </select>
- </div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ュ簭浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -327,43 +309,11 @@
//#endregion
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- ////鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- //form.on('select(HInitTimeCycle)', function (data) {
- // var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- // //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- // if (HInitTimeCycle != -1) {
- // $('#HBeginDate').prop('disabled', true);
- // $('#HEndDate').prop('disabled', true);
-
- // $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- // $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- // //鎵ц鏌ヨ鏂规硶
- // get_FastQuery();
- // } else {
- // $('#HBeginDate').prop('disabled', false);
- // $('#HEndDate').prop('disabled', false);
- // }
- //});
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- ////鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- //setSelect_HInitTimeCycle();
- ////鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //if (HInitTimeCycle != -1) {
- // $('#HBeginDate').prop('disabled', true);
- // $('#HEndDate').prop('disabled', true);
- //} else {
- // $('#HBeginDate').prop('disabled', false);
- // $('#HEndDate').prop('disabled', false);
- //}
-
- ////鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -451,7 +401,7 @@
if (obj.event == '宸ュ簭浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -563,8 +513,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HOrgID = "";
var HNumber = $("#HNumber").val();//宸ュ簭浠ｇ爜
var HName = $("#HName").val();//宸ュ簭鍚嶇О
@@ -640,12 +589,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -669,10 +613,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+
$("#HNumber").val("");
$("#HName").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -693,21 +634,6 @@
- ////#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- //function setSelect_HInitTimeCycle() {
- // var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- // var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
-
- // var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
- // for (var i = 0; i < valueList.length; i++) {
- // HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
- // }
- // $("#HInitTimeCycle").empty();
- // $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
- // form.render('select');
- // $("#HInitTimeCycle").val("29");
- //}
- ////#endregion
//#region 鏂板
function set_AddNew() {
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 4f72c25..2e1f3c9 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"
@@ -30,18 +30,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
<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="HNumber" id="HNumber">
@@ -401,7 +389,7 @@
//鐢熶骇璧勬簮浠ｇ爜
if (obj.event == '鐢熶骇璧勬簮浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐢熶骇璧勬簮浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -411,8 +399,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid='+linterid+'&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -692,8 +679,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
@@ -770,12 +756,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+
if (number == 1) {
HOrgID = sessionStorage["OrganizationID"];
}
@@ -804,8 +785,7 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 *30), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+
$("#HNumber").val("");
$("#HName").val("");
$("#HOrgID").val(sessionStorage["OrganizationID"]);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 3d0bda8..f78d2f6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -90,8 +90,6 @@
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
- </div>
-
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -146,7 +144,6 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
</div>
</div>
-
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -174,7 +171,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
-
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -587,34 +584,7 @@
};
}
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
-
- //鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
- , area: ['100%', '100%']
- , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
- , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- end: function () { //褰撳叧闂椂璋冪敤
- get_FastQuery(table, option);
- }
- , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- });
+
//#endregion
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
@@ -629,7 +599,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = [];
+
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
@@ -643,8 +613,6 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } 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
@@ -656,22 +624,7 @@
}
}
}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
+
option.data = data1.data;
ins = table.render(option);
layer.close(index);
@@ -774,7 +727,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index e2ac837..c714d1d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -371,34 +372,34 @@
}
});
})
+
+ //#region
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2,
+ area: ['100%', '100%'],
+ title: '缂栬緫鍣ㄥ叿淇濆吇',
+ closeBtn: 1,
+ shade: 0.7,
+ maxmin: true,
+ anim: 0,
+ content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&closeType=1',
+ resize: false,
+
+ end: function () {
+ get_FastQuery(table, option);
+ },
+ cancel: function () {
+
+ }
+ })
+
+ }
+ });
//#endregion
- ////#region
- //table.on('tool(mainTable)', function (obj) {
- // var data = obj.data;
- // if (obj.event == '鍗曟嵁鍙�') {
- // var linterid = data.hmainid.toString();
- // layer.open({
- // type: 2,
- // area: ['100%', '100%'],
- // title: '缂栬緫鍣ㄥ叿淇濆吇' + HPageTitle,
- // closeBtn: 1,
- // shade: 0.7,
- // maxmin: true,
- // anim: 0,
- // content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&closeType=1',
- // resize: false,
-
- // end: function () {
- // get_FastQuery(table, option);
- // },
- // cancel: function () {
-
- // }
- // })
-
- // }
- //});
- ////#endregion
//蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -774,11 +775,11 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else if ($inArray(data[i].name, totalArray) - 1) {
+ else if ($.inArray(data[i].name, totalArray) - 1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, table: true, width: 120 })
- }/* else if (data[i].name == '鍗曟嵁鍙�') {*/
- // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event:'鍗曟嵁鍙�' })
- //}
+ }else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event:'鍗曟嵁鍙�' })
+ }
else {
switch (data[i].Type) {
//int
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
index 54fc964..6459414 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
@@ -127,7 +127,7 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- </div>
+ </div>
</form>
<!--</div>-->
@@ -152,7 +152,7 @@
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
@@ -206,16 +206,16 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer','soulTable'], function () {
+ }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer', 'soulTable'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , laydate = layui.laydate
- , table = layui.table
- , form = layui.form
- , soulTable = layui.soulTable
- , element = layui.element;
-
+ , admin = layui.admin
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , soulTable = layui.soulTable
+ , element = layui.element;
+
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate1'
@@ -233,12 +233,12 @@
, colFilterRecord: true//鏄惁寮�鍚瓧娈电瓫閫夌殑璁板繂鍔熻兘
, data: []
, totalRow: true,
- // , url: GetWEBURL()+'GetPOOrderBill'
- , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ // , url: GetWEBURL()+'GetPOOrderBill'
+ , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
, defaultToolbar: ['filter', 'exports', 'print']
// , where: { msg: "", NowPage: 1, OnePage: 10 }
, cellMinWidth: 100
-
+
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
@@ -259,173 +259,173 @@
, { field: '宸ュ簭', title: '宸ュ簭', width: 160, sort: true }
, { field: '鍗曚环 ', title: '鍗曚环', width: 215, sort: true }
, { field: '鏁伴噺 ', title: '鏁伴噺 ', totalRow: true,, width: 115, sort: true }
- , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', sort: true }
- , { field: '鎶ュ簾鏁� ', title: '鎶ュ簾鏁�', width: 100, sort: true }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
- , { field: '淇敼浜� ', title: '淇敼浜�', sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
- , { field: '鍏抽棴浜� ', title: '鍏抽棴浜�', sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', sort: true }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', sort: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', sort: true }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷 ', sort: true }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', sort: true }
- , { field: 'HBillType', title: 'HBillType', sort: true }
- , { field: 'HBillSubType', title: 'HBillSubType', sort: true }
- , { field: 'HICMOInterID', title: 'HICMOInterID', sort: true }
- , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', sort: true }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', sort: true }
+ , { field: '鎶ュ簾鏁� ', title: '鎶ュ簾鏁�', width: 100, sort: true }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
+ , { field: '淇敼浜� ', title: '淇敼浜�', sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
+ , { field: '鍏抽棴浜� ', title: '鍏抽棴浜�', sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', sort: true }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', sort: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', sort: true }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷 ', sort: true }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', sort: true }
+ , { field: 'HBillType', title: 'HBillType', sort: true }
+ , { field: 'HBillSubType', title: 'HBillSubType', sort: true }
+ , { field: 'HICMOInterID', title: 'HICMOInterID', sort: true }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', sort: true }
- ]]
- //, skin: 'row' //琛ㄦ牸椋庢牸
- // , even: true
- , page: true //鏄惁鏄剧ず鍒嗛〉
+ ]]
+ //, skin: 'row' //琛ㄦ牸椋庢牸
+ // , even: true
+ , page: true //鏄惁鏄剧ず鍒嗛〉
, limits: [50, 500, 5000, 20000]
, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
//, height: 500
, done: function (res, curr, count) {
-
+
_cur_page = curr;
layer.closeAll("loading");
}
- });
+ });
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch (obj.event) {
- case 'btn-getCheckData':
- var data = checkStatus.data;
- layer.alert(JSON.stringify(data));
- break;
- //case 'getCheckLength':
- // var data = checkStatus.data;
- // layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
- // break;
- //case 'isAll':
- // layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
- // break;
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-getCheckData':
+ var data = checkStatus.data;
+ layer.alert(JSON.stringify(data));
+ break;
+ //case 'getCheckLength':
+ // var data = checkStatus.data;
+ // layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
+ // break;
+ //case 'isAll':
+ // layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
+ // break;
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
- case 'btn-reload':
- _cur_page = $(".layui-laypage-em").next().html();
- RoadHBillNo(sql);
- break;
- case 'btn-confirm':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- _cur_page = $(".layui-laypage-em").next().html();
- if (data[0]["鐘舵��"] == "鏈‘璁�") {
- layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
- $.ajax({
- type: "get",
- url: GetWEBURL()+"POOrderAccept",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { icon: 1 });
- RoadHBillNo(sql);
- }
- else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- }
- })
-
- layer.close(index);
- });
-
- }
- else {
- layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜纭鎿嶄綔锛�", { icon: 5 });
- }
- break;
- case 'btn-back':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- _cur_page = $(".layui-laypage-em").next().html();
- var HBackRemark;
- if (data[0]["鐘舵��"] == "鏈‘璁�") {
-
- layer.prompt({
- formType: 2,
- //value: '',
- title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
- area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
- }, function (value, index, elem) {
- HBackRemark = value.toString();
- $.ajax({
- type: "get",
- url: GetWEBURL()+"POOrderRefuse",
- data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
- RoadHBillNo(sql);
- }
- else {
- // $("#verifycode").click();
- layer.msg(result.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- }
- })
- //alert(value); //寰楀埌value
- layer.close(index);
- });
-
- }
- else {
- layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜椹冲洖鎿嶄綔锛�", { icon: 5 });
- }
- break;
- case 'btn-details':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
-
- var linterid = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閲囪喘璁㈠崟'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- break;
- case 'btn-generate':
- var checkStatus = table.checkStatus('mainTable')
+ //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+ case 'btn-reload':
+ _cur_page = $(".layui-laypage-em").next().html();
+ RoadHBillNo(sql);
+ break;
+ case 'btn-confirm':
+ var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- ajaxLabelData = data;
- var rows = '';
- var HEntry = '';
- for (var i = 0; i < data.length; i++) {
- if (data[i]["鐘舵��"] == "宸茬‘璁�") {
- rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
- }
- else {
- HEntry += (i + 1) + ',';
- }
+ _cur_page = $(".layui-laypage-em").next().html();
+ if (data[0]["鐘舵��"] == "鏈‘璁�") {
+ layer.confirm('鏄惁纭鍗曟嵁?', { icon: 3, title: '鎻愮ず' }, function (index) {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "POOrderAccept",
+ data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(result.Message, { icon: 1 });
+ RoadHBillNo(sql);
+ }
+ else {
+ // $("#verifycode").click();
+ layer.msg(result.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ }
+ })
+
+ layer.close(index);
+ });
+
+ }
+ else {
+ layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜纭鎿嶄綔锛�", { icon: 5 });
+ }
+ break;
+ case 'btn-back':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ _cur_page = $(".layui-laypage-em").next().html();
+ var HBackRemark;
+ if (data[0]["鐘舵��"] == "鏈‘璁�") {
+
+ layer.prompt({
+ formType: 2,
+ //value: '',
+ title: '璇疯緭鍏ラ┏鍥炵悊鐢�',
+ area: ['400px', '200px'] //鑷畾涔夋枃鏈煙瀹介珮
+ }, function (value, index, elem) {
+ HBackRemark = value.toString();
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "POOrderRefuse",
+ data: { "HInterID": data[0]["hmainid"].toString(), "HBillNo": data[0]["鍗曟嵁鍙�"].toString(), "HUser": sessionStorage["HUserName"], "HBackRemark": HBackRemark },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg("鎷掔粷鎴愬姛锛�", { icon: 1 });
+ RoadHBillNo(sql);
+ }
+ else {
+ // $("#verifycode").click();
+ layer.msg(result.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ }
+ })
+ //alert(value); //寰楀埌value
+ layer.close(index);
+ });
+
+ }
+ else {
+ layer.msg("蹇呴』鏄湭纭鍗曟嵁鎵嶈兘杩涜椹冲洖鎿嶄綔锛�", { icon: 5 });
+ }
+ break;
+ case 'btn-details':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閲囪喘璁㈠崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../../src/views/SRM/SRM_POOrderBill.html?linterid=' + linterid
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
}
- if (HEntry != '') {
- HEntry = HEntry.substring(0, HEntry.length - 1);
- layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+ })
+ break;
+ case 'btn-generate':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ ajaxLabelData = data;
+ var rows = '';
+ var HEntry = '';
+ for (var i = 0; i < data.length; i++) {
+ if (data[i]["鐘舵��"] == "宸茬‘璁�") {
+ rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
}
- else{
+ else {
+ HEntry += (i + 1) + ',';
+ }
+ }
+ if (HEntry != '') {
+ HEntry = HEntry.substring(0, HEntry.length - 1);
+ layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+ }
+ else {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -439,30 +439,30 @@
// $(".layui-btn").removeClass("layui-btn-disabled");
//}
})
- }
- break;
- case 'btn-exit':
- //var index = parent.layer.getFrameIndex(window.name);
- //element.tabDelete('layadmin-layout-tabs', this);
- parent.layui.admin.events.closeThisTabs();
- //parent.layer.close(index);
- break;
- };
- });
+ }
+ break;
+ case 'btn-exit':
+ //var index = parent.layer.getFrameIndex(window.name);
+ //element.tabDelete('layadmin-layout-tabs', this);
+ parent.layui.admin.events.closeThisTabs();
+ //parent.layer.close(index);
+ break;
+ };
+ });
- ///鍔犺浇鏄剧ず鏁版嵁
- function RoadHBillNo(sqlWhere) {
- where = sqlWhere;
- $.ajax({
- type: "get",
- url: GetWEBURL()+"/Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json",
- async: true,
- data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"]},//"HSupNo": sessionStorage["HUserName"],
- success: function (result) {
- if (result.count == 1) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadHBillNo(sqlWhere) {
+ where = sqlWhere;
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json",
+ async: true,
+ data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
+ success: function (result) {
+ if (result.count == 1) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
data: ajaxReturnData
, height: 'full-10'
@@ -476,122 +476,122 @@
});
//layer.close(index0);
} else {
- //layer.close(index0);
- layer.alert(result.code + result.Message, { icon: 5 });
- }
-
- },
- error: function (result) {
- console.log(result);
//layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
- };
- form.on('submit(f_Query)', function (data) {//鏌ヨ
- var sqlWhere = " and 1=1 ";
- //if ($("#HStatus").val() != "")
- // sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
- var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- var HNumber = $("#HNumber").val();//鐗╂枡浠ｇ爜
- var HName = $("#HName").val();//鐗╂枡鍚嶇О
- var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
- var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
- var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
- if (HBillNo)
- sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
- if (HNumber)
- sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
- if (HName)
- sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
- if (HModel)
- sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
- //if ($("#HClStatus").val() != "")
- // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
- //if ($("#HPURCHASEORGID").val() != "")
- // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
- if (HDate1) {
- sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+ },
+ error: function (result) {
+ console.log(result);
+ //layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- if (HDate2) {
- sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
- }
- //if ($("#HISGenerate").val() != "") {
- // if ($("#HISGenerate").val() == "鏄�")
- // {
- // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
- // }
- // else if ($("#HISGenerate").val() == "鍚�") {
- // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
- // }
- //}
-
-
- var Time = $("#Time").val();
- var dd = new Date();
- var dt;
- switch (Time) {
- case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
- case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
- case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
- case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
- case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
- case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
- case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
- default: dd = new Date(dd.setDate(dd.getDate()));
- }
- dt = dd.getFullYear().toString();
- if (dd.getMonth() + 1 < 10) {
- dt = dt + "-0" + (dd.getMonth() + 1).toString();
- }
- else {
- dt = dt + "-0" + (dd.getMonth() + 1).toString();
- }
- if (dd.getDate() < 10) {
- dt = dt + "-0" + dd.getDate().toString();
- }
- else {
- dt = dt + "-" + dd.getDate().toString();
- }
- //if (Time != 8) {
- // sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
- //}
- sql = sqlWhere;
- //浠庣涓�椤靛紑濮�
- _cur_page = 1;
- RoadHBillNo(sqlWhere);
});
- var $ = layui.$, active = {
- f_Query: function () { //鏌ヨ
+ };
+ form.on('submit(f_Query)', function (data) {//鏌ヨ
+ var sqlWhere = " and 1=1 ";
+ //if ($("#HStatus").val() != "")
+ // sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HNumber = $("#HNumber").val();//鐗╂枡浠ｇ爜
+ var HName = $("#HName").val();//鐗╂枡鍚嶇О
+ var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+ var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
+ var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
- },
- f_Qrjq: function () { //鎺ュ彈
+ if (HBillNo)
+ sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ if (HNumber)
+ sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
+ if (HName)
+ sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ if (HModel)
+ sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ //if ($("#HClStatus").val() != "")
+ // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+ //if ($("#HPURCHASEORGID").val() != "")
+ // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+ if (HDate1) {
+ sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+ }
+ if (HDate2) {
+ sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
+ }
+ //if ($("#HISGenerate").val() != "") {
+ // if ($("#HISGenerate").val() == "鏄�")
+ // {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+ // }
+ // else if ($("#HISGenerate").val() == "鍚�") {
+ // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+ // }
+ //}
- },
- f_Bhjq: function () { //鎷掔粷
- },
- //JSreload: function () {
- // var demoReload = $('#test-table-demoReload');
- // //鎵ц閲嶈浇
- // table.JSreload('test-table-reload', {
- // page: {
- // curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- // }
- // , where: {
- // key: {
- // id: demoReload.val()
- // }
- // }
- // });
- //}
- };
- $('.test-table-reload-btn .layui-btn').on('click', function () {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
+ var Time = $("#Time").val();
+ var dd = new Date();
+ var dt;
+ switch (Time) {
+ case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+ case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+ case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+ case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+ case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+ case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+ case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+ default: dd = new Date(dd.setDate(dd.getDate()));
+ }
+ dt = dd.getFullYear().toString();
+ if (dd.getMonth() + 1 < 10) {
+ dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ }
+ else {
+ dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ }
+ if (dd.getDate() < 10) {
+ dt = dt + "-0" + dd.getDate().toString();
+ }
+ else {
+ dt = dt + "-" + dd.getDate().toString();
+ }
+ //if (Time != 8) {
+ // sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ //}
+ sql = sqlWhere;
+ //浠庣涓�椤靛紑濮�
+ _cur_page = 1;
+ RoadHBillNo(sqlWhere);
});
+ var $ = layui.$, active = {
+ f_Query: function () { //鏌ヨ
+
+ },
+ f_Qrjq: function () { //鎺ュ彈
+
+ },
+ f_Bhjq: function () { //鎷掔粷
+
+ },
+ //JSreload: function () {
+ // var demoReload = $('#test-table-demoReload');
+ // //鎵ц閲嶈浇
+ // table.JSreload('test-table-reload', {
+ // page: {
+ // curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ // }
+ // , where: {
+ // key: {
+ // id: demoReload.val()
+ // }
+ // }
+ // });
+ //}
+ };
+ $('.test-table-reload-btn .layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+ });
</script>
</body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList_Last.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList_Last.html"
index 895d9af..4b993af 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList_Last.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList_Last.html"
@@ -43,33 +43,7 @@
</select>
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
- </div>
- </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -92,16 +66,16 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -116,7 +90,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -346,10 +320,7 @@
$("#HWorkBillNo").val("");
$("#HBillNo").val("");
$("#HProcExchBillNo").val("");
- $("#HRelationQty").val("1");
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
+ $("#HRelationQty").val("1");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -385,9 +356,7 @@
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
var HRelationQty = $("#HRelationQty").val();
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
+;
var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 02b1c2a..3dd9a72 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -416,7 +417,7 @@
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -447,8 +448,8 @@
var col = [];
var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ for (var key in result.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -477,7 +478,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: result.data
, height: 800
, page: true
, totalRow: true
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/Cg_PODemandPlanConfigBillList.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/Cg_PODemandPlanConfigBillList.html"
index 3fb9dad..10b4e07 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/Cg_PODemandPlanConfigBillList.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/Cg_PODemandPlanConfigBillList.html"
@@ -10,7 +10,9 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -401,7 +403,7 @@
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫'//璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -432,8 +434,8 @@
var col = [];
var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ for (var key in result.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -462,7 +464,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: result.data
, height: 800
, page: true
, totalRow: true
@@ -529,14 +531,14 @@
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.data.length != 0) {
+ success: function (result) {
+ if (result.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- dataCol = data1.data[0].HGridString.split(',');
+ dataCol = result.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
var dataCols = dataCol[i].split('|');
@@ -549,8 +551,8 @@
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;";
+ if (result.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + result.data[0].HFontSize + "px;";
} else {
option.cols[0][i + 1]["style"] = "font-size:100%";
}
@@ -588,10 +590,10 @@
}
}
//鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (result.data[0].HFixCols != 0) {
+ for (var i = 0; i < result.data[0].HFixCols; i++) {
if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
+ result.data[0].HFixCols += 1;
}
option.cols[0][i + 1]["fixed"] = "left";
}
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_WorkWarehouseBillList.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_WorkWarehouseBillList.html"
index ca894ad..92f7e47 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_WorkWarehouseBillList.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_WorkWarehouseBillList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -379,7 +380,7 @@
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -410,8 +411,8 @@
var col = [];
var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ for (var key in result.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -440,7 +441,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: result.data
, height: 800
, page: true
, totalRow: true
@@ -588,21 +589,21 @@
sWhere = "";
}
//#endregion
- //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
}
- $("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
form.render('select');
+
+ $("#HInitTimeCycle").val("29");
}
//#endregion
//鐢熶骇杞﹂棿鍒楄〃
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index bbd5bdd..c7c1d86 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -43,7 +43,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
- <div class="layui-input-block" >
+ <div class="layui-input-block">
<input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -52,7 +52,7 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display: none;" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="display: none;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="display: none;">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
@@ -95,91 +95,6 @@
</div>
</div>
</div>
-
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -209,7 +124,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -227,7 +142,7 @@
var option = [];
var HModName = "JIT_DayPlanBillList";
//#endregion
- var titleData = ["hmainid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
@@ -309,8 +224,6 @@
get_Display(sWhere);
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
-
- ColFilter();
}
//#endregion
@@ -407,35 +320,7 @@
}
})
}
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
- //鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
- , area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
- , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- end: function () { //褰撳叧闂椂璋冪敤
- get_FastQuery(table, option);
- }
- , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- });
- //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -444,57 +329,11 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
- var data = [];//鍒楀瓧娈垫暟鎹�
- var col = [];
- var totalArray = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- 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++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- 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 if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } 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 'DateTime':
- 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: true, width: 200 });
- }
- }
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
-
if (result.count == 1) {
option.data = result.data;
table.render(option);
layer.close(ajaxLoad);
- DisPlay_HideColumn();
+
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, "4610", HModName, sessionStorage["HUserName"]);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -522,80 +361,7 @@
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HICOMBillNo = $("#HICOMBillNo").val();//鐢熶骇璁㈠崟鍙�
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -636,16 +402,6 @@
$("#HMaterName").val("");//鐗╂枡鍚嶇О
$("#HMaterNumber").val("");//鐗╂枡缂栫爜
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
-
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
sWhere = "";
}
//#endregion
@@ -793,7 +549,7 @@
})
}
}
-
+
//#region 鏂板
function set_AddNew() {
@@ -999,14 +755,14 @@
}
});
})
- //#endregion
+ //#endregion
//#region 褰撳叾瀹冮〉闈㈤渶瑕佹湰椤甸潰寮圭獥锛屾牴鎹紶閫掔殑鍙傛暟鏄剧ず椤甸潰鍐呭
function judgeOperationType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
-
+
if (OperationType == null || OperationType == 1) { //鏂板
OperationType = 1;
} else if (OperationType == 2) { //浜х嚎璐ㄦ骞冲彴鎹㈠崟锛氳椤甸潰灞曠ず褰撳ぉ瀵瑰簲鐢熶骇璧勬簮涓嬬殑鏃ヨ鍒掔敓浜у崟
@@ -1040,23 +796,6 @@
}
//#endregion
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
-
- form.render('select');
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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_BCP.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_BCP.html"
index b02d247..bf1b7cd 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_BCP.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_BCP.html"
@@ -178,61 +178,6 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -1436,76 +1381,28 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
+ var sWheres = "";
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
+ sWheres += " and [" + ColName + "] " + com;
}
sWhere = {
@@ -1591,12 +1488,6 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
form.render('select');
sWhere = "";
}
@@ -3557,10 +3448,6 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
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 9a9cb75..640c6c0 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"
@@ -43,8 +43,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="Organization" id="Organization" lay-verify="Organization">-->
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- <!--</select>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <!--</select>
</div>
</div>-->
<div class="layui-inline">
@@ -65,89 +65,7 @@
</div>
<div class="layui-row" style="margin: 10px 0 10px;">
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -170,7 +88,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -265,9 +183,6 @@
get_Display(sWhere);
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
-
-
- ColFilter();
}
//#endregion
@@ -287,27 +202,27 @@
}
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HMainID', title: 'hmainid', hide: true, sort: true}
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100, sort: true}
- , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 120, sort: true}
- , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜', sort: true}
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true}
- , { field: '鐘舵��', title: '鐘舵��', sort: true}
- , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', sort: true}
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true}
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true}
- , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', sort: true}
- , { field: '鏈棩璁″垝', title: '鏈棩璁″垝', sort: true, totalRow: true}
- , { field: '澶囨枡鐘舵��', title: '澶囨枡鐘舵��', sort: true}
- , { field: '浠撳簱纭', title: '浠撳簱纭', sort: true}
- , { field: '浠撳簱纭鏃堕棿', title: '浠撳簱纭鏃堕棿', sort: true}
- , { field: '鎵ц纭', title: '鎵ц纭', sort: true}
- , { field: '鎵ц纭鏃堕棿', title: '鎵ц纭鏃堕棿', sort: true}
- , { field: '鏈棩瀹屽伐', title: '鏈棩瀹屽伐', sort: true, totalRow: true}
- , { field: '鎬昏鍒掓暟', title: '鎬昏鍒掓暟', sort: true, totalRow: true}
- , { field: '瀹屽伐鏁�', title: '瀹屽伐鏁�', sort: true, totalRow: true}
- , { field: '瀹屽伐鏍囪', title: '瀹屽伐鏍囪', sort: true}
- , { field: '浼樺厛绾�', title: '浼樺厛绾�', sort: true}
+ , { field: 'HMainID', title: 'hmainid', hide: true, sort: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100, sort: true }
+ , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 120, sort: true }
+ , { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜', sort: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', sort: true }
+ , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', sort: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', sort: true }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', sort: true }
+ , { field: '鏈棩璁″垝', title: '鏈棩璁″垝', sort: true, totalRow: true }
+ , { field: '澶囨枡鐘舵��', title: '澶囨枡鐘舵��', sort: true }
+ , { field: '浠撳簱纭', title: '浠撳簱纭', sort: true }
+ , { field: '浠撳簱纭鏃堕棿', title: '浠撳簱纭鏃堕棿', sort: true }
+ , { field: '鎵ц纭', title: '鎵ц纭', sort: true }
+ , { field: '鎵ц纭鏃堕棿', title: '鎵ц纭鏃堕棿', sort: true }
+ , { field: '鏈棩瀹屽伐', title: '鏈棩瀹屽伐', sort: true, totalRow: true }
+ , { field: '鎬昏鍒掓暟', title: '鎬昏鍒掓暟', sort: true, totalRow: true }
+ , { field: '瀹屽伐鏁�', title: '瀹屽伐鏁�', sort: true, totalRow: true }
+ , { field: '瀹屽伐鏍囪', title: '瀹屽伐鏍囪', sort: true }
+ , { field: '浼樺厛绾�', title: '浼樺厛绾�', sort: true }
]]
};
}
@@ -371,80 +286,7 @@
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
if (HICOMNo) {
sWhere += " and 鐢熶骇浠诲姟鍗曞彿 like '%" + HICOMNo + "%'";
}
@@ -490,7 +332,7 @@
}
});
})
- //#endregion
+ //#endregion
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
@@ -503,15 +345,6 @@
$("#HMaterName").val("");//鐗╂枡鍚嶇О
$("#HMaterNumber").val("");//鐗╂枡缂栫爜
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
sWhere = "";
}
//#endregion
@@ -557,7 +390,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_ICMOSortBill/JIT_ICMOSortBillCheck',
type: "GET",
- data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HDate": HDate, "HStatus": staus, "user": sessionStorage["HUserName"]},
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HDate": HDate, "HStatus": staus, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message);
@@ -719,24 +552,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
- }
-
- /鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
- if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
-
- form.render('select');
}
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index be8ca12..cf78efb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -393,7 +394,7 @@
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -424,8 +425,8 @@
var col = [];
var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ for (var key in result.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -454,7 +455,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [col]
- , data: data1.data
+ , data: result.data
, height: 800
, page: true
, totalRow: true
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
index 49006b2..75e91a9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\200\200\346\226\231\347\224\263\350\257\267\345\215\225/JIT_CallGoodsBackRequestBillList.html"
@@ -300,7 +300,9 @@
set_InitGrid();
//鏌ヨ
get_Display(sWhere);
- //鏃ユ湡鍒濆鍖�
+
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
if (HInitTimeCycle != -1) {
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 d95c936..26da651 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"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -181,23 +182,23 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
</div>
</script>
@@ -266,7 +267,7 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
- case 'set_AddNew': set_AddNew();
+ case 'set_AddNew': set_AddNew();
break;
//鏂板瀛愯矾绾�
case 'set_AddNewSub': set_AddNewSub();
@@ -557,12 +558,12 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -611,7 +612,7 @@
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 if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
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_RoutingBillListQuery.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_RoutingBillListQuery.html"
index b91ea0e..80cc532 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_RoutingBillListQuery.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_RoutingBillListQuery.html"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -207,7 +208,7 @@
</script>
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -246,7 +247,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+
//鍒濆鍖栫晫闈�
set_ClearBill();
//鍒濆鍖栬〃鏍�
@@ -488,12 +489,12 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -536,7 +537,7 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
@@ -999,7 +1000,7 @@
})
}
- //#region 鏄庣粏 闅愯棌鍒楄缃�
+ //#region 鏄庣粏 闅愯棌鍒楄缃�
function get_HideColumn2() {
var colName = "";
var contentUrl = "";
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_His.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_His.html"
index 969d297..9969f40 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_His.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_His.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
<script src="../../../layuiadmin/pubcustom.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
@@ -522,12 +523,12 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
- , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , title: '缂栬緫'//璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -570,7 +571,7 @@
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 if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else if (data[i].name == '鍗曟嵁鍙�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
@@ -635,7 +636,7 @@
var ColName = $("#ColName").val();//浠绘剰瀛楁杩囨护涓嬫媺鍒楄〃
var Comparator = $("#Comparator").val() //浠绘剰瀛楁杩囨护杩愮畻绗�
var ColContent = $("#ColContent").val(); //浠绘剰瀛楁杩囨护 杩囨护鏁版嵁
-
+
var ColName1 = $("#ColName1").val();//澶嶉�夋
var Comparator1 = $("#Comparator1").val()
var ColContent1 = $("#ColContent1").val();
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html"
index 83f20dc..06d3bca 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMainList.html"
@@ -31,6 +31,13 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
@@ -82,6 +89,60 @@
</div>
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -253,12 +314,41 @@
//#endregion
//#endregion
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -281,12 +371,39 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
};
}
//#endregion
- //#endregion
+
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/瀹夌伅閫愮骇鍛煎彨瑙勫垯/OA_AndengFlowRuleBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -297,7 +414,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
-
+ var totalArray = [];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -310,6 +427,10 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } 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) {
@@ -329,6 +450,22 @@
}
}
}
+ ////鍔ㄦ�佹樉绀哄垪鍚�
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 800
+ // , page: true
+ // , totalRow: true
+ // , cellMinWidth: 90
+ // , limit: 50
+ // , limits: [50, 500, 5000, 20000]
+ // , done: function (res, curr, count) {
+ // soulTable.render(this);
+ // }
+ //}
option.cols = [col];
option.data = data1.data;
@@ -409,18 +546,38 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");
$("#ColContent").val("");
$("#ColName").val("0");
- $("#Comparator").val("0");
+ $("#Comparator").val("0"); $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0"); $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
}
//#endregion
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -667,7 +824,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["hmainid", "HEntryID", "HDeptID", "HReceiveDeptID", "HErrMsgBackTypeID", "HOrgID", "HDutyID"];
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -749,7 +906,9 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
index a38d979..d29ff59 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
@@ -60,61 +60,6 @@
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
-
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -207,12 +152,6 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
form.render('select');
sWhere = "";
//$("#btnSearch").click();
@@ -266,33 +205,7 @@
};
}
//#endregion
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
- //鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
- , area: ['100%', '100%']
- , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../杞﹂棿绠＄悊/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
- , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- end: function () { //褰撳叧闂椂璋冪敤
- get_FastQuery(table, option);
- }
- , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- });
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -316,10 +229,6 @@
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } 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) {
@@ -348,7 +257,7 @@
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -374,12 +283,6 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -400,48 +303,6 @@
break;
}
sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
}
if (HDate) {
sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
@@ -618,8 +479,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HParentID",];
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
@@ -701,10 +561,6 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
- $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index d0ade37..029286f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -272,7 +272,7 @@
break;
};
});
-
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
get_FastQuery();
@@ -295,7 +295,7 @@
// 杩涘嚭绔欐煡璇�
function get_Display2(sWhere) {
-
+
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
@@ -306,6 +306,7 @@
if (data1.count == 1) {
var data = [];
var col = [];
+
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -358,7 +359,7 @@
// $("#HICMOBillNo").val(data1.data[0]["鐢熶骇璁㈠崟鍙�"]);
// $("#HProcExchBillNo").val(data1.data[0]["娴佽浆鍗�"]);
//}
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -735,7 +736,7 @@
// 蹇�熻繃婊�
function get_FastQuery() {
var HBardCode = $("#HBardCode").val();
-
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -745,26 +746,27 @@
var ColName2 = $("#ColName2").val();//澶嶉�夋
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
- var com = "";
+
if (ColName != 0 && Comparator != 0) {
+ var com = "";
switch (Comparator) {
case "7":
- com = "like ''%" + ColContent + "%''";
+ com = "like'%" + ColContent + "%'";
break;
case "8":
- com = "like ''%" + ColContent + "''";
+ com = "like'%" + ColContent + "'";
break;
case "9":
- com = "like ''" + ColContent + "%''";
+ com = "like'" + ColContent + "%'";
break;
case "10":
- com = "not like ''%" + ColContent + "%''";
+ com = "not like'%" + ColContent + "%'";
break;
default:
- com = "" + Comparator + " ''" + ColContent + "''";
+ com = "" + Comparator + "'" + ColContent + "'";
break;
}
- com = " and (" + ColName + " " + com + ")";
+ sWhere += " and " + ColName + " " + com;
}
if (ColName1 != 0 && Comparator1 != 0) {
var com1 = "";
@@ -803,12 +805,35 @@
com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
}
- sWhere += com + com1 + com2;
+
+ //var com = "";
+ //if (ColName != 0 && Comparator != 0) {
+ // switch (Comparator) {
+ // case "7":
+ // com = "like ''%" + ColContent + "%''";
+ // break;
+ // case "8":
+ // com = "like ''%" + ColContent + "''";
+ // break;
+ // case "9":
+ // com = "like ''" + ColContent + "%''";
+ // break;
+ // case "10":
+ // com = "not like ''%" + ColContent + "%''";
+ // break;
+ // default:
+ // com = "" + Comparator + " ''" + ColContent + "''";
+ // break;
+ // }
+ // com = " and (" + ColName + " " + com + ")";
+ //}
+
+ //sWhere += com;
if (HBardCode!="") {
sWhere += " order by 鍑虹珯鏃堕棿";
@@ -822,7 +847,7 @@
get_Display7(HBardCode);//宸ヨ壓鍙傛暟
get_Display4(HBardCode);//閰嶄欢鍙樻洿璁板綍
}
-
+
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -830,15 +855,15 @@
$("#HICMOBillNo").val("");
$("#HBardCode").val("");
$("#HProcExchBillNo").val("");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -878,7 +903,7 @@
}
})
}
-
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -971,10 +996,8 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
$("#ColName2").append(Organization);
form.render('select');
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
index 09b5b93..d0e2520 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBillList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
@@ -28,6 +29,25 @@
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -304,6 +324,24 @@
get_FastQuery(2);
});
//#endregion
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
//#endregion
@@ -311,6 +349,23 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -346,6 +401,33 @@
//#endregion
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HInterID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Gy_WorkBeginDotCheckListBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -357,6 +439,7 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = [];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -368,7 +451,11 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
+ } else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } 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
@@ -416,7 +503,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
-
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//鐗╂枡浠ｇ爜
var HName = $("#HName").val();//鐗╂枡鍚嶇О
@@ -428,6 +516,8 @@
var Comparator1 = $("#Comparator1").val()
var ColContent1 = $("#ColContent1").val();
var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -486,10 +576,16 @@
com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -508,6 +604,9 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
$("#HProNumber").val("");
$("#HName").val("");
@@ -527,7 +626,23 @@
sWhere = "";
}
//#endregion
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"]; //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+ for (var i = 0; i < valueList.length; i++) { // 閬嶅巻valueList 鏁扮粍 浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+ }
+
+ $("#HInitTimeCycle").empty(); //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+ form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+ $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+ }
+ //#endregion
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -765,7 +880,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID", "HCheckPostID"];
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
index d981133..94eff8f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBillList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
@@ -324,7 +325,7 @@
});
//#endregion
- //#endregion
+
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -348,7 +349,6 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
-
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -364,7 +364,8 @@
//鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- }
+
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -407,7 +408,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HInterID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -473,22 +474,8 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
- } //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
}
+
option.cols = [col];
option.data = data1.data;
table.render(option);
@@ -592,7 +579,7 @@
com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -964,7 +951,23 @@
form.render('select');
}
//#endregion
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"]; //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+ for (var i = 0; i < valueList.length; i++) { // 閬嶅巻valueList 鏁扮粍 浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+ }
+
+ $("#HInitTimeCycle").empty(); //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+ form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+ $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+ }
+ //#endregion
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -1256,23 +1259,7 @@
}
});
}
- //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"]; //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
-
- var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
- for (var i = 0; i < valueList.length; i++) { // 閬嶅巻valueList 鏁扮粍 浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
- HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
- }
-
- $("#HInitTimeCycle").empty(); //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
- $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
- form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
-
- $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
- }
- //#endregion
+
//#endregion
</script>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
index 50e6374..0eb26c6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
@@ -14,7 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
-
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
@@ -28,6 +28,25 @@
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -306,12 +325,44 @@
});
//#endregion
- //#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -338,7 +389,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limits: [50, 500, 5000, 50000]
, done: function (res, curr, count) {
soulTable.render(this);
}
@@ -346,7 +397,34 @@
}
//#endregion
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HInterID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/闃查敊楠岃瘉/Gy_MaterPreventErrMouldBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -373,6 +451,8 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } 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) {
@@ -420,7 +500,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
-
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//鐗╂枡浠ｇ爜
var HName = $("#HName").val();//鐗╂枡鍚嶇О
@@ -432,6 +513,8 @@
var Comparator1 = $("#Comparator1").val()
var ColContent1 = $("#ColContent1").val();
var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -452,7 +535,8 @@
break;
}
sWhere += " and " + ColName + " " + com;
- } if (ColName1 != 0 && Comparator1 != 0) {
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
var com1 = "";
switch (Comparator1) {
case "7":
@@ -494,7 +578,12 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
-
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -512,20 +601,24 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
$("#HProNumber").val("");
$("#HName").val("");
$("#HReceiveEmp").val("");
$("#HBillStatus").val("");
- $("#ColContent1").val("");
+
+
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0"); $("#ColContent1").val("");
$("#ColName1").val("0");
$("#Comparator1").val("0");
$("#ColContent2").val("");
$("#ColName2").val("0");
$("#Comparator2").val("0");
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
form.render('select');
sWhere = "";
@@ -656,7 +749,7 @@
}
}
-
+
//鍏抽棴/鍙嶅叧闂�
function set_CloseBills(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -688,7 +781,7 @@
}
}
-
+
//浣滃簾/鍙嶄綔搴�
function set_DropBill(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -721,7 +814,7 @@
}
//#endregion
-
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -769,7 +862,8 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
//var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID"];
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -844,15 +938,29 @@
}
}
$("#ColName").empty();
- $("#ColName").append(Organization);
- $("#ColName1").empty();
- $("#ColName1").append(Organization);
- $("#ColName2").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
$("#ColName2").append(Organization);
form.render('select');
}
//#endregion
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"]; //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+ for (var i = 0; i < valueList.length; i++) { // 閬嶅巻valueList 鏁扮粍 浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+ }
+
+ $("#HInitTimeCycle").empty(); //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+ form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+ $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+ }
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBillList.html"
index f06df1b..2eda87e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Qc_PreventErrMouldCheckBillList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
@@ -404,7 +405,7 @@
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.HInterID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -472,22 +473,23 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
- } //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
}
+ ////鍔ㄦ�佹樉绀哄垪鍚�
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 800
+ // , page: true
+ // , totalRow: true
+ // , cellMinWidth: 90
+ // , limit: 50
+ // , limits: [50, 500, 5000, 20000]
+ // , done: function (res, curr, count) {
+ // soulTable.render(this);
+ // }
+ //}
option.cols = [col];
option.data = data1.data;
table.render(option);
--
Gitblit v1.9.1