From 3a1e17f87f01404201ad30c79857877c5766e7a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 16 九月 2025 17:01:03 +0800
Subject: [PATCH] 修复 部分单据 读取方案时 无法渲染自定义过滤条件的问题
---
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 8
WebTM/views/生产管理/生产退库单/Sc_ProductionReturnList.html | 23
WebTM/views/车间管理/报表分析/sc_ICOMRKReport.html | 4
WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMainList.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 36
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 6
WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMainList.html | 13
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 11
WebTM/views/计划管理/产线对应器具清单/Gy_SourceMouldList.html | 2
WebTM/views/销售管理/信用额度申请单/Xs_CusRatingChangeBillList.html | 17
WebTM/views/采购管理/采购订单变更单/Cg_POOrderChangeBillList.html | 6
WebTM/views/销售管理/出门确认单/Xs_OutDoorCheckBillList.html | 12
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillQuery.html | 177 +-
WebTM/views/车间管理/报表分析/Sc_ProcessErrStationReport.html | 8
WebTM/views/销售管理/销售退货单/Kf_ICStockBackBillList.html | 14
WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html | 31
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 3
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 14
WebTM/views/生产管理/生产报表/ProductionAnalysisReport.html | 23
WebTM/views/采购管理/付款单/YF_PayMentBillQuery.html | 166 +-
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 32
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBillList.html | 114 +
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html | 1
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html | 9
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html | 171 +-
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBillList.html | 40
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 181 +-
WebTM/views/领料发货/领料出库/Kf_StockOutRequestBillList.html | 23
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 15
WebTM/views/销售管理/应收单/Xs_ReceivableBillList.html | 10
WebTM/views/仓存管理/委外用料单/WW_PPBomBillList.html | 223 ++-
WebTM/views/销售管理/出门确认单_新/Xs_OutDoorBillList.html | 8
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 2
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 9
WebTM/views/销售管理/客户拜访记录单/Crm_ComplainVisitBillMainList.html | 11
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 10
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 6
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 220 ++-
WebTM/views/仓存管理/组托单/Sc_PackUnionBillMain_Setto.html | 16
WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html | 17
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 3
WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html | 23
WebTM/views/车间管理/防错验证/Qc_PreventErrMouldCheckBillList.html | 127 +
WebTM/views/采购管理/询价单/Sup_AskPriceBillList.html | 210 ++-
WebTM/views/领料发货/领料出库/Kf_MateOutRequestBillList.html | 14
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 8
WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html | 120 +
WebTM/views/销售管理/应收单/Xs_ReceivableBillQuery.html | 11
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBillList.html | 33
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 4
WebTM/views/销售管理/销售订单/Xs_SeOrderBillQuery.html | 6
WebTM/views/领料发货/销售出库/Kf_SellOutBillQuery.html | 6
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 11
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html | 11
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html | 24
WebTM/views/生产管理/客户标签/Sc_CustomerTagBarCodeList.html | 10
WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html | 31
WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html | 238 ++-
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 242 ++-
WebTM/views/车间管理/报表分析/Sc_ProcExchangeNoInReport.html | 4
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBillList.html | 142 +
WebTM/views/销售管理/销售报价单/Xs_SeQuotationBillMainList.html | 11
WebTM/views/领料发货/生产领料/Kf_ProductReceiveMaterialBillList.html | 119 +
WebTM/views/销售管理/收款单/YS_ReceiveBillList.html | 8
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 18
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html | 1
WebTM/views/销售管理/应收退款单/YS_ReceiveBackBillList.html | 10
WebTM/views/采购管理/报价单/Sup_QuotePriceBillList.html | 37
WebTM/views/采购管理/采购调价单/Cg_POStockInChangeBillList.html | 10
WebTM/views/销售管理/收款单/YS_ReceiveBillQuery.html | 10
WebTM/views/销售管理/销售订单变更单/Xs_SeOrderChangeBillList.html | 10
WebTM/views/车间管理/车间在制品期初单/CJ_WIPBeginStockBillList.html | 17
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html | 144 +
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 47
75 files changed, 2,036 insertions(+), 1,384 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index d5c61e9..ac23e03 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -454,10 +454,10 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
+ get_FastQuery()
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ // ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -636,13 +636,19 @@
}
}
option.data = data1.data;
+ DisPlay_HideColumn()
table.render(option);
- layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter()
+ }
+
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1243";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1259,7 +1265,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
index 5a43bee..170cf9d 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231\345\215\225/WW_PPBomBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>濮斿鐢ㄦ枡鍗曞垪琛�</title>
@@ -17,6 +18,7 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -33,72 +35,85 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HBillNo"
+ style="width:190px;">
</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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ 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="HEndDates" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDates"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HDepartName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HDepartName"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HMaterNumber"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMaterName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HMaterName"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浠撳簱</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HStocID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HStocID"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" id="HMakerMan" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HMakerMan"
+ style="width:190px;">
</div>
</div>
</div>
@@ -107,19 +122,25 @@
<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" 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -127,7 +148,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
@@ -137,19 +159,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -157,26 +185,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -184,7 +219,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -248,7 +284,7 @@
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
-
+
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -351,33 +387,30 @@
//鍒濆鍖栬〃鏍�
set_InitGrid(); //鎵ц琛ㄦ牸鍒濆鍖栨柟娉�
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(); //鎵ц鏌ヨ鏂规硶
-
- //闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();//鎵ц闅愯棌鏂规硶
+ get_FastQuery(); //鎵ц鏌ヨ鏂规硶
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ //闅愯棌鍕鹃�夊瓧娈�
+ //DisPlay_HideColumn();//鎵ц闅愯棌鏂规硶
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ get_DefaultModule();
}
//鍒濆鍖栬〃鏍�
- function set_InitGrid() {
+ function set_InitGrid() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //鍒濆鍖栧紑濮嬫椂闂�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //鍒濆鍖栫粨鏉熸椂闂�
var columns = [ //鍒濆鍖栬〃鍗�
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'} // 鍒濆鍖栧悎璁¤
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' } // 鍒濆鍖栧悎璁¤
, { field: 'hmainid', title: '鍗曟嵁ID', width: 200, hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true }
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, hide: true, sort: true }
, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 110, sort: true }
, { field: 'HUnitID', title: 'HUnitID', width: 200, hide: true, sort: true }
, { field: '鍗曚綅', title: '鍗曚綅', width: 200, sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true}
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true }
, { field: '绫诲瀷', title: '绫诲瀷', width: 200, sort: true }
, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
@@ -393,7 +426,7 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200, sort: true }
- //褰撳埗鍗曟棩鏈� d.鍒跺崟鏃ユ湡 == null ? '' : layui.util.toDateString(...) 鏄竴涓笁鍏冭繍绠楃琛ㄨ揪寮忥紝鐢ㄤ簬鏍规嵁鏉′欢鏉ュ喅瀹氳繑鍥炲摢涓�笺��
+ //褰撳埗鍗曟棩鏈� d.鍒跺崟鏃ユ湡 == null ? '' : layui.util.toDateString(...) 鏄竴涓笁鍏冭繍绠楃琛ㄨ揪寮忥紝鐢ㄤ簬鏍规嵁鏉′欢鏉ュ喅瀹氳繑鍥炲摢涓�笺��
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
@@ -425,7 +458,7 @@
, done: function (res, curr, count) { // done 鐗瑰畾鍑芥暟璋冪敤res curr count鍙傛暟 res锛氳〃绀哄紓姝ユ搷浣滅殑缁撴灉 銆乧urr锛氳〃绀哄綋鍓嶅鐞嗙殑鍏冪礌銆佺姸鎬併�佹垨鑰呮槸鍦ㄤ竴绯诲垪澶勭悊涓綋鍓嶇殑浣嶇疆 锛宑ount锛氳〃绀哄凡缁忓鐞嗘垨瀹屾垚鐨勫厓绱犳暟閲�
soulTable.render(this); //琛ㄥ崟娓叉煋
}
- };
+ };
}
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
@@ -457,7 +490,7 @@
})
}
});
- //#endregion
+ //#endregion
//鍔犺浇缃戞牸
function get_Display(sWhere) { //鍔犺浇缃戞牸璋冪敤swhere鍙傛暟
@@ -468,7 +501,7 @@
type: "GET", //鏁版嵁璇锋眰
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, //data閲屼竴涓〃鍗曞睘鎬where锛屽拰user灞炴�� 鍊煎彇鑷猻essionsorage鐨刪username涓�
success: function (data1) { //杩涘叆data1 // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
- if(data1.count == 1) { //鍒ゆ柇鏁版嵁缁熻鏄惁鍞竴 鍒ゆ柇瀵硅薄 data1 涓槸鍚﹀瓨鍦╟ount灞炴�т笖count灞炴�ф槸鍚︾瓑浜�1
+ if (data1.count == 1) { //鍒ゆ柇鏁版嵁缁熻鏄惁鍞竴 鍒ゆ柇瀵硅薄 data1 涓槸鍚﹀瓨鍦╟ount灞炴�т笖count灞炴�ф槸鍚︾瓑浜�1
var data = []; //鍒楀瓧娈垫暟鎹�
var col = []; //瀹氫箟搴旇绱㈠紩鏁扮粍
var totalArray = []; //鍒涘缓 闇�瑕佸悎璁＄殑瀛楁缁�
@@ -481,23 +514,24 @@
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) { // 浣跨敤 $.inArray() 鏂规硶 鏌ヨtitledata涓槸鍚︽湁鑾峰彇鍒扮殑瀛楁锛屾湁娴嬭繘琛屼笅涓� 鍦ㄦ壘涓嶅埌鍏冪礌鏃朵細杩斿洖 - 1
- // 鍒楃殑鏁版嵁瀛楁鍚岻D 鍒楃殑鏍囬 鍐呭灞呬腑
+ // 鍒楃殑鏁版嵁瀛楁鍚岻D 鍒楃殑鏍囬 鍐呭灞呬腑
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒� 鏍规嵁data鏁扮粍涓殑瀛楁ID鍜屽瓧娈靛悕 ID闇�瑕侀殣钘忕殑瀛楁
- }
+ }
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒� // 濡傛灉 data[i].name 瀛樺湪浜� totalArray 涓�
- // 鍒楃殑鏁版嵁瀛楁鍚岻D // 鍒楃殑鏍囬 //鍐呭灞呬腑 //璇ュ垪鏀寔鎺掑簭 //鐢ㄤ簬鍚堣琛岃绠楁垨鏄剧ず
+ // 鍒楃殑鏁版嵁瀛楁鍚岻D // 鍒楃殑鏍囬 //鍐呭灞呬腑 //璇ュ垪鏀寔鎺掑簭 //鐢ㄤ簬鍚堣琛岃绠楁垨鏄剧ず
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });//鏍规嵁totalarry鏁扮粍涓殑瀛楁id鍜宯ame 鎵惧埌data琛ㄥ崟涓搴旂殑鏁版嵁鍒� 杩涜璁＄畻鍚堣
} else if (data[i].name == '鍗曟嵁鍙�') { //鍒ゆ柇鑾峰彇鍒扮殑瀛楁鏁版嵁鏄惁涓哄崟鎹彿銆�
- // 鍒楃殑鏁版嵁瀛楁鍚岻D / / 鍒楃殑鏍囬 //鍐呭灞呬腑 //璇ュ垪鏀寔鎺掑簭
+ // 鍒楃殑鏁版嵁瀛楁鍚岻D / / 鍒楃殑鏍囬 //鍐呭灞呬腑 //璇ュ垪鏀寔鎺掑簭
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;'});// event杩欎釜灞炴�у彲鑳芥槸鑷畾涔夌殑锛岀敤浜庡湪鍒椾笂缁戝畾鐗瑰畾鐨勪簨浠舵垨琛屼负
+ }, style: 'cursor: pointer;'
+ });// event杩欎釜灞炴�у彲鑳芥槸鑷畾涔夌殑锛岀敤浜庡湪鍒椾笂缁戝畾鐗瑰畾鐨勪簨浠舵垨琛屼负
} else {
switch (data[i].Type) {//鑾峰彇鍒扮殑鏁� 涓哄瓧绗︿覆绫诲瀷
//int
case 'DateTime': //褰撳畠涓烘椂闂存椂
- // 鏍规嵁鍒梚d鍜屽垪鍚嶈繘琛岄�夋嫨锛屽綋涓篸ata[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name 鍒� " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')鍘绘樉绀烘椂闂�
+ // 鏍规嵁鍒梚d鍜屽垪鍚嶈繘琛岄�夋嫨锛屽綋涓篸ata[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name 鍒� " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')鍘绘樉绀烘椂闂�
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:
@@ -524,26 +558,30 @@
}
option.data = data1.data; //琛ㄦ牸鏁版嵁
- // table 鎸囪〃鏍肩粍浠� render 鏂规硶鐢ㄦ潵閰嶇疆option鐢熶骇琛ㄧ粨鏋�
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
+ // table 鎸囪〃鏍肩粍浠� render 鏂规硶鐢ㄦ潵閰嶇疆option鐢熶骇琛ㄧ粨鏋�
table.render(option); //鐢ㄤ簬娓叉煋鎴栭噸鏂版覆鏌撲竴涓〃鏍�
layer.close(wait); //璋冪敤鍙兘鏄负浜嗗叧闂竴涓箣鍓嶅洜涓哄叾浠栧師鍥狅紙濡傜瓑寰呮煇浜涘垵濮嬪寲鎿嶄綔瀹屾垚锛夎�屾樉绀虹殑鍔犺浇灞�
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();//鎵撳紑 鏄剧ず闅愯棌鏂规硶
//jQuery閫夋嫨鍣�$("#Comparator")鎵惧埌椤甸潰涓奍D涓篊omparator鐨勫厓绱狅紙閫氬父鏄竴涓緭鍏ユ銆侀�夋嫨妗嗙瓑琛ㄥ崟鍏冪礌锛�.val()鏂规硶鐢ㄤ簬鑾峰彇璇ュ厓绱犵殑鍊�
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { //褰撶敤鎴峰皢ID涓篊omparator鐨勫厓绱犵殑鍊艰缃负0锛屽苟涓斿皢ID涓篊olContent鐨勫厓绱犵殑鍊兼竻绌猴紙鎴栦繚鎸佷负绌猴級鏃讹紝鑷姩璋冪敤ColFilter鍑芥暟鏉ユ墽琛屾煇绉嶄笌鍒楃浉鍏崇殑鎿嶄綔銆傝繖绉嶉�昏緫閫氬父鐢ㄤ簬琛ㄥ崟澶勭悊鎴栨暟鎹繃婊ょ殑鍦烘櫙涓紝浠ヤ究鍦ㄧ敤鎴锋病鏈夋寚瀹氭煇浜涜繃婊ゆ潯浠舵椂鑷姩搴旂敤涓�缁勯粯璁ょ殑杩囨护瑙勫垯
- ColFilter(); //濡傛灉涓婅堪涓や釜鏉′欢閮戒负鐪燂紝閭ｄ箞鎵цColFilter(); 銆傝繖閲孋olFilter鏄竴涓嚜瀹氫箟鐨勫嚱鏁帮紝鍙兘鐢ㄤ簬瀵硅〃鏍煎垪杩涜杩囨护銆佹帓搴忔垨鍏朵粬涓庡垪鐩稿叧鐨勬搷浣溿��
- }
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { //褰撶敤鎴峰皢ID涓篊omparator鐨勫厓绱犵殑鍊艰缃负0锛屽苟涓斿皢ID涓篊olContent鐨勫厓绱犵殑鍊兼竻绌猴紙鎴栦繚鎸佷负绌猴級鏃讹紝鑷姩璋冪敤ColFilter鍑芥暟鏉ユ墽琛屾煇绉嶄笌鍒楃浉鍏崇殑鎿嶄綔銆傝繖绉嶉�昏緫閫氬父鐢ㄤ簬琛ㄥ崟澶勭悊鎴栨暟鎹繃婊ょ殑鍦烘櫙涓紝浠ヤ究鍦ㄧ敤鎴锋病鏈夋寚瀹氭煇浜涜繃婊ゆ潯浠舵椂鑷姩搴旂敤涓�缁勯粯璁ょ殑杩囨护瑙勫垯
+ // ColFilter(); //濡傛灉涓婅堪涓や釜鏉′欢閮戒负鐪燂紝閭ｄ箞鎵цColFilter(); 銆傝繖閲孋olFilter鏄竴涓嚜瀹氫箟鐨勫嚱鏁帮紝鍙兘鐢ㄤ簬瀵硅〃鏍煎垪杩涜杩囨护銆佹帓搴忔垨鍏朵粬涓庡垪鐩稿叧鐨勬搷浣溿��
+ // }
} else {
layer.close(wait); //璋冪敤鍙兘鏄负浜嗗叧闂竴涓箣鍓嶅洜涓哄叾浠栧師鍥狅紙濡傜瓑寰呮煇浜涘垵濮嬪寲鎿嶄綔瀹屾垚锛夎�屾樉绀虹殑鍔犺浇灞�
- //data1琛ㄥ崟鏁版嵁code鍜孧essage灞炴�х殑瀵硅薄
+ //data1琛ㄥ崟鏁版嵁code鍜孧essage灞炴�х殑瀵硅薄
layer.alert(data1.code + data1.Message, { icon: 5 }); //鎻愮ず寮圭獥5 鎻愮ず鍐呭data1.code + data1.Message 閿欒鎻愮ず璀﹀憡
}
}, error: function () {
layer.close(wait); //璋冪敤鍏抽棴
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); //寮圭獥鎻愮ず澶辫触
}
- });
+ });
}
//鏂板
function set_AddNew() {
@@ -590,7 +628,7 @@
}
})
} else {
- // 濡傛灉娌℃湁閫夋嫨涓�琛屾暟鎹垨閫夋嫨浜嗗琛屾暟鎹紝鍒欏脊鍑烘彁绀轰俊鎭�
+ // 濡傛灉娌℃湁閫夋嫨涓�琛屾暟鎹垨閫夋嫨浜嗗琛屾暟鎹紝鍒欏脊鍑烘彁绀轰俊鎭�
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
@@ -600,7 +638,7 @@
//閫変腑琛屾敼鍙橀鑹�
//obj.tr锛氳幏鍙栬鐐瑰嚮鐨勮鐨刯Query瀵硅薄 ,find(':checkbox:first')锛氬湪琚偣鍑荤殑琛屼腑鏌ユ壘绗竴涓閫夋,prop('checked')锛氳幏鍙栬繖涓閫夋鐨刢hecked灞炴�х殑鍊硷紝!锛氬checked灞炴�х殑鍊艰繘琛岄�昏緫闈炴搷浣渧ar flag = ...锛氬皢閫昏緫闈炴搷浣滅殑缁撴灉璧嬪�肩粰鍙橀噺flag
var flag = !obj.tr.find(':checkbox:first').prop('checked'); //鑾峰彇琚偣鍑荤殑澶嶉�夋琛岃繘琛屽垽鏂槸鍚﹂�変腑
- // find(':checkbox') 锛氬湪琚偣鍑荤殑琛屼腑鏌ユ壘鎵�鏈夌殑澶嶉�夋锛屽皢鎵�鏈夎繖浜涘閫夋鐨刢hecked灞炴�ц缃负flag鐨勫��
+ // find(':checkbox') 锛氬湪琚偣鍑荤殑琛屼腑鏌ユ壘鎵�鏈夌殑澶嶉�夋锛屽皢鎵�鏈夎繖浜涘閫夋鐨刢hecked灞炴�ц缃负flag鐨勫��
obj.tr.find(':checkbox').prop('checked', flag); //灏嗘墍鏈夌殑澶嶉�夋杩欑涓篺lag鏍规嵁绗竴涓閫夋鏉ュ垽鏂�
if (flag) {
obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
@@ -610,8 +648,8 @@
$(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTable, function (i, l) {
- // 浠ｇ爜鐨勭洰鐨勬槸閬嶅巻layui琛ㄦ牸鐨勭紦瀛樻暟鎹紝鎵惧埌涓巓bj.tr鎵�鎸囧悜鐨勮瀵瑰簲鐨勭紦瀛橀」锛屽苟淇敼鍏舵煇涓嚜瀹氫箟灞炴�э紙鍋囪涓篖AY_CHECKED锛夌殑鍊� // i鏄暟缁勭殑绱㈠紩锛堝浜庡璞℃潵璇达紝鍙互璁や负鏄敭锛夛紝鑰宭鏄綋鍓嶉亶鍘嗗埌鐨勯」鐨勫��
+ layui.each(table.cache.mainTable, function (i, l) {
+ // 浠ｇ爜鐨勭洰鐨勬槸閬嶅巻layui琛ㄦ牸鐨勭紦瀛樻暟鎹紝鎵惧埌涓巓bj.tr鎵�鎸囧悜鐨勮瀵瑰簲鐨勭紦瀛橀」锛屽苟淇敼鍏舵煇涓嚜瀹氫箟灞炴�э紙鍋囪涓篖AY_CHECKED锛夌殑鍊� // i鏄暟缁勭殑绱㈠紩锛堝浜庡璞℃潵璇达紝鍙互璁や负鏄敭锛夛紝鑰宭鏄綋鍓嶉亶鍘嗗埌鐨勯」鐨勫��
if (obj.tr.index() == l.LAY_TABLE_INDEX) { //寰幆琛ㄦ牸浣挎瘡涓�琛屾坊鍔犱竴涓储寮�
l.LAY_CHECKED = flag;//鎵惧埌瀵瑰簲琛岀粰涓�涓槸鍚﹂�変腑鐨勭姸鎬�
}
@@ -631,13 +669,13 @@
$.ajax({ //GET璇锋眰鍒版湇鍔″櫒
type: "GET", // 璇锋眰鐨勭被鍨�
url: GetWEBURL() + "/Sc_MouldProdInBill/set_DeleteBill", //璇锋眰鐨刄RL 鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // data灞炴�у寘鍚簡瑕佸彂閫佸埌鏈嶅姟鍣ㄧ殑鏁版嵁銆傝繖閲屾槸涓�涓璞★紝鍖呭惈涓や釜灞炴�э細HInterID鍜寀ser銆傚畠浠殑鍊煎垎鍒潵鑷狪nterID鍙橀噺鍜宻essionStorage["HUserName"]锛堜粠浼氳瘽瀛樺偍涓幏鍙栫殑鐢ㄦ埛鍚嶏級
+ // data灞炴�у寘鍚簡瑕佸彂閫佸埌鏈嶅姟鍣ㄧ殑鏁版嵁銆傝繖閲屾槸涓�涓璞★紝鍖呭惈涓や釜灞炴�э細HInterID鍜寀ser銆傚畠浠殑鍊煎垎鍒潵鑷狪nterID鍙橀噺鍜宻essionStorage["HUserName"]锛堜粠浼氳瘽瀛樺偍涓幏鍙栫殑鐢ㄦ埛鍚嶏級
data: { "HInterID": InterID, "user": sessionStorage["HUserName"] }, // 鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁浣滀负鏌ヨ鍙傛暟闄勫姞鍒癠RL涓� //data閲屼竴涓〃鍗曞睘鎬nterid锛屽拰user灞炴��
- // 褰撹姹傛垚鍔熸椂璋冪敤鐨勫嚱鏁� 鎺ュ彈鏀朵竴涓弬鏁皉esult
+ // 褰撹姹傛垚鍔熸椂璋冪敤鐨勫嚱鏁� 鎺ュ彈鏀朵竴涓弬鏁皉esult
success: function (result) {
- // 鍦ㄥ洖璋冨嚱鏁板唴閮紝棣栧厛妫�鏌ユ湇鍔″櫒杩斿洖鐨勬暟鎹腑count灞炴�х殑鍊兼槸鍚︾瓑浜�1
+ // 鍦ㄥ洖璋冨嚱鏁板唴閮紝棣栧厛妫�鏌ユ湇鍔″櫒杩斿洖鐨勬暟鎹腑count灞炴�х殑鍊兼槸鍚︾瓑浜�1
if (result.count == 1) { //鍒ゆ柇瀵硅薄 data1 涓槸鍚﹀瓨鍦╟ount灞炴�т笖count灞炴�ф槸鍚︾瓑浜�1
- // { time: 1 * 1000, icon: 1 }鏄竴涓厤缃璞★紝鎸囧畾浜嗘秷鎭鐨勬樉绀烘椂闂翠负1绉掞紙1 * 1000姣锛夛紝骞朵笖浣跨敤鍥炬爣1锛堥�氬父琛ㄧず鎴愬姛鎴栫Н鏋佺殑娑堟伅
+ // { time: 1 * 1000, icon: 1 }鏄竴涓厤缃璞★紝鎸囧畾浜嗘秷鎭鐨勬樉绀烘椂闂翠负1绉掞紙1 * 1000姣锛夛紝骞朵笖浣跨敤鍥炬爣1锛堥�氬父琛ㄧず鎴愬姛鎴栫Н鏋佺殑娑堟伅
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name); //棣栧厛灏濊瘯閫氳繃window.name鑾峰彇褰撳墠iframe鐨勭储寮� 鐒跺悗璧嬪�肩粰鍙傛暟index
@@ -650,9 +688,9 @@
} else {
layer.alert(result.code + result.Message, { icon: 5 }); //鎻愮ず寮圭獥5 鎻愮ず鍐呭data1.code + data1.Message 閿欒鎻愮ず璀﹀憡
}
- layer.close(wait);
+ layer.close(wait);
}, error: function () {
- // 濡傛灉AJAX璇锋眰澶辫触
+ // 濡傛灉AJAX璇锋眰澶辫触
layer.close(wait); //鍒欏叧闂姞杞�
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });//鎻愮ず锛屽苟鏄剧ず涓�鏉￠敊璇秷鎭�
}
@@ -676,7 +714,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- //../BaseSet/SRM_OpenTmpList.html锛夛紝骞堕檮鍔犱簡涓変釜鏌ヨ鍙傛暟锛坙interid銆丮yMsg 鍜� Type锛夛紝瀹冧滑鐨勫�奸兘鏉ヨ嚜琚�変腑鐨勮鏁版嵁鐨� hmainid 灞炴��
+ //../BaseSet/SRM_OpenTmpList.html锛夛紝骞堕檮鍔犱簡涓変釜鏌ヨ鍙傛暟锛坙interid銆丮yMsg 鍜� Type锛夛紝瀹冧滑鐨勫�奸兘鏉ヨ嚜琚�変腑鐨勮鏁版嵁鐨� hmainid 灞炴��
, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
, resize: false //绂佹鐢ㄦ埛璋冩暣灞傜殑澶у皬
})
@@ -737,7 +775,7 @@
});
}
else {
- // 濡傛灉琚�変腑鐨勮鏁版嵁闀垮害涓嶇瓑浜�1
+ // 濡傛灉琚�変腑鐨勮鏁版嵁闀垮害涓嶇瓑浜�1
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒'); //鎻愮ず璇烽�夋嫨涓�琛屾暟鎹�
}
}
@@ -766,7 +804,7 @@
layer.alert(result.code + result.Message, { icon: 5 });// 浣跨敤layer搴撴樉绀轰竴涓鍛婃锛屾樉绀篳result.code`鍜宍result.Message`鐨勬嫾鎺ュ唴瀹癸紝骞惰缃浘鏍囦负閿欒鍥炬爣 鎻愮ず涓�涓敊璇脊鍑烘
}
}, error: function () { //褰撹姹傚け璐ユ椂锛屾墽琛岃繖涓嚱鏁般��
-
+
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });// 浣跨敤layer搴撴樉绀轰竴涓鍛婃锛屾彁绀衡�滄帴鍙ｈ姹傚け璐�!鈥濓紝骞惰缃浘鏍囦负閿欒鍥炬爣
}
});
@@ -865,7 +903,7 @@
}
if (HBeginDate) {//鍒ゆ柇寮�濮嬫椂闂�
- //varchar(100)绫诲瀷 锛屽瓧娈碉紝鏃堕棿鏍煎紡
+ //varchar(100)绫诲瀷 锛屽瓧娈碉紝鏃堕棿鏍煎紡
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'"; //鍚� sWhere 瀛楃涓叉坊鍔犱竴涓潯浠惰鏉′欢瑕佹眰鏁版嵁搴撲腑鐨勨�滄棩鏈熲�濆瓧娈碉紙杞崲涓虹壒瀹氭牸寮忕殑瀛楃涓插悗锛夊繀椤诲ぇ浜庢垨绛変簬 HBeginDate 鍙橀噺鎸囧畾鐨勫��
}
if (HEndDate) { //鍒ゆ柇缁撴潫鏃堕棿
@@ -906,7 +944,7 @@
$("#HBillNo").val(""); //灏嗗崟鎹彿璁剧疆涓虹┖鍊�
$("#HDepartName").val(""); //灏嗛儴闂ㄥ悕绉拌缃负绌哄��
$("#HMaterNumber").val(""); //灏嗙墿鏂欎唬鐮佽绌�
- $("#HMaterName").val(""); //灏嗙墿鏂欏悕绉拌绌�
+ $("#HMaterName").val(""); //灏嗙墿鏂欏悕绉拌绌�
$("#HStocID").val(""); //灏嗕粨搴撳悕绉拌绌�
$("#HMakerMan").val(""); //灏嗗埗鍗曚汉璁剧┖
$("#ColName").val(); //澶嶉�夋 鑾峰彇鍙� ID 涓� ColName 鐨勫厓绱犵殑鍊�
@@ -974,9 +1012,9 @@
success: function (data1) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
if (data1.data.length != 0) { // 妫�鏌� data1.data 鏁扮粍鐨勯暱搴︽槸鍚︿笉涓�0
var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HDeptID", "HUnitID", "HMaterID", "HWHID", "HSPID", "婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"]; //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HDeptID", "HUnitID", "HMaterID", "HWHID", "HSPID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"]; //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//浠� data1.data 鏁扮粍鐨勭涓�涓厓绱犱腑鎻愬彇 HGridString 灞炴�х殑鍊硷紝灏嗚繖涓�硷紙涓�涓�楀彿鍒嗛殧鐨勫瓧绗︿覆锛夊垎鍓叉垚涓�涓暟缁勶紝骞跺皢杩欎釜鏁扮粍璧嬪�肩粰 dataCol 鍙橀噺
- dataCol = data1.data[0].HGridString.split(',');
+ dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) { // 寰幆鏁扮粍閲屽噺鍘讳袱涓暱搴� 浠� 0 閬嶅巻鍒� option.cols[0].length - 2銆傛敞鎰忚繖閲屽噺鍘讳簡 2锛屽彲鑳芥槸鍥犱负鏌愪簺鐗瑰畾鐨勫垪锛堝鏈�鍚庝袱鍒楋級涓嶉渶瑕佽澶勭悊鎴栬�� dataCol 鏁扮粍鐨勯暱搴︿笌 option.cols[0] 涓嶅畬鍏ㄥ搴斻��
var dataCols = dataCol[i].split('|'); //瀵逛簬 dataCol 鏁扮粍涓殑姣忎釜鍏冪礌 | 鍒嗗壊鎴愭暟缁� dataCols
@@ -1033,7 +1071,7 @@
if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {//妫�鏌ュ綋鍓嶅垪锛堥�氳繃 i+1 绱㈠紩锛屽洜涓哄彲鑳借烦杩囦簡绗竴鍒楁垨鏌愪簺鍒楁湭鍖呭惈鍦ㄥ唴锛夌殑鏍囬鏄惁瀛樺湪浜� titleData 鏁扮粍涓�
data1.data[0].HFixCols += 1;//濡傛灉鍒楁爣棰樺湪 titleData 涓壘鍒� 鍦� data1.data[0].HFixCols 鍦ㄥ寰幆涓�娆�
}
- option.cols[0][i + 1]["fixed"] = "left"; // 鏃犺鍒楁爣棰樻槸鍚﹀湪 titleData 涓紝閮藉皢褰撳墠鍒楋紙閫氳繃 i+1 绱㈠紩锛夋爣璁颁负鍐荤粨鍦ㄥ乏渚�
+ option.cols[0][i + 1]["fixed"] = "left"; // 鏃犺鍒楁爣棰樻槸鍚﹀湪 titleData 涓紝閮藉皢褰撳墠鍒楋紙閫氳繃 i+1 绱㈠紩锛夋爣璁颁负鍐荤粨鍦ㄥ乏渚�
}
}
table.render(option);//娓叉煋琛ㄦ牸
@@ -1050,7 +1088,7 @@
function setSelect_HInitTimeCycle() {
var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; // 瀹氫箟涓�涓唬琛ㄤ笉鍚岀殑鏃堕棿闂撮殧鐨勫ぉ鏁版暟缁�
var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"]; //瀹氫箟鏁扮粍涓巚aluelist鏁扮粍涓�鏍峰搴� 涓斾綔鐢ㄦ樉绀轰笌涓嬫媺妗�
- //鍒涘缓涓�涓瓧绗︿覆 HInitTimeCycle_ArrayList锛岀敤浜庢瀯寤轰笅鎷夐�夋嫨妗嗙殑 HTML銆傝繖閲岄鍏堟坊鍔犱簡涓�涓粯璁ら�夐」锛屽叾鍊间负 - 1锛屾枃鏈负鈥滀换鎰忛棿闅斺�濓紝骞朵笖琚缃负閫変腑鐘舵��
+ //鍒涘缓涓�涓瓧绗︿覆 HInitTimeCycle_ArrayList锛岀敤浜庢瀯寤轰笅鎷夐�夋嫨妗嗙殑 HTML銆傝繖閲岄鍏堟坊鍔犱簡涓�涓粯璁ら�夐」锛屽叾鍊间负 - 1锛屾枃鏈负鈥滀换鎰忛棿闅斺�濓紝骞朵笖琚缃负閫変腑鐘舵��
var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
for (var i = 0; i < valueList.length; i++) {//閬嶅巻 valueList 鏁扮粍锛屽浜庢暟缁勪腑鐨勬瘡涓�硷紝
//灏嗗搴旂殑閫夐」娣诲姞鍒� HInitTimeCycle_ArrayList 瀛楃涓蹭腑 姣忎釜閫夐」鐨� value 灞炴�ц缃负 valueList 涓殑鍊硷紝鏂囨湰璁剧疆涓� titleList 涓搴旂殑鍚嶇О锛屽苟涓旇缃瓧浣撻鑹蹭负钃濊壊
@@ -1073,7 +1111,7 @@
for (var i = 1; i < option.cols[0].length; i++) { //寰幆鍒楄〃鏁扮粍锛屽叾涓寘鍚簡鍒楃殑淇℃伅銆傚惊鐜粠绱㈠紩 1 寮�濮嬶紝鍙兘鏄洜涓虹储寮� 0 鐨勯」琚涓虹壒娈婃垨涓嶅笇鏈涘寘鍚湪涓嬫媺鍒楄〃涓�
if (option.cols[0][i].hide != true) { //杩欒浠ｇ爜妫�鏌ュ綋鍓嶈凯浠ｇ殑鍒楀璞★紙option.cols[0][i]锛夌殑 hide 灞炴�ф槸鍚︿笉绛変簬 true銆傚鏋滀笉绛変簬 true锛堝嵆璇ュ垪鏈闅愯棌
- // 鍚� Organization 瀛楃涓茶拷鍔犱竴涓柊鐨� < option > 鍏冪礌,灏嗘柊 < option > 鍏冪礌鐨� value 灞炴�у拰鏄剧ず鐨勬枃鏈兘璁剧疆涓哄綋鍓嶅垪鐨� field 灞炴�у�硷紝骞惰缃簡瀛椾綋棰滆壊涓鸿摑鑹�
+ // 鍚� Organization 瀛楃涓茶拷鍔犱竴涓柊鐨� < option > 鍏冪礌,灏嗘柊 < option > 鍏冪礌鐨� value 灞炴�у拰鏄剧ず鐨勬枃鏈兘璁剧疆涓哄綋鍓嶅垪鐨� field 灞炴�у�硷紝骞惰缃簡瀛椾綋棰滆壊涓鸿摑鑹�
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</ option>';
}
}
@@ -1094,7 +1132,7 @@
$.ajax({ //璇锋眰璋冪敤
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',//璋冪敤鐨剈rl鍦板潃
type: "GET", //璋冪敤鐨勬柟娉�
- // user": 杩欎釜灞炴�х殑鍊兼槸閫氳繃璁块棶sessionStorage瀵硅薄鐨�"Czybm"閿潵鑾峰彇鐨� // "HInterID": 杩欎釜灞炴�х殑鍊艰纭紪鐮佷负0
+ // user": 杩欎釜灞炴�х殑鍊兼槸閫氳繃璁块棶sessionStorage瀵硅薄鐨�"Czybm"閿潵鑾峰彇鐨� // "HInterID": 杩欎釜灞炴�х殑鍊艰纭紪鐮佷负0
//Type": 杩欎釜灞炴�х殑鍊艰璁剧疆涓�"Default"銆傝繖閫氬父鎰忓懗鐫�璇ュ璞℃垨鏁版嵁椤硅閰嶇疆涓轰娇鐢ㄩ粯璁ょ殑绫诲瀷鎴栬涓�
data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },//鍦╓eb搴旂敤绋嬪簭涓紶閫掔敤鎴蜂俊鎭�佹ā鍧楀悕绉般�佷氦浜扞D浠ュ強鏁版嵁椤圭殑绫诲瀷锛屼互渚胯繘琛岃繘涓�姝ョ殑澶勭悊鎴栨樉绀�
success: function (data1) { // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
@@ -1106,7 +1144,7 @@
//杩囨护鏂规鍐呯爜
HInterID = data[0].hmainid //data 鏁扮粍鐨勭涓�涓厓绱犲苟浠庤鍏冪礌涓幏鍙栦竴涓悕涓� hmainid 鐨勫睘鎬ц祴鍊肩粰HInterID 鍙橀噺
//杩囨护鏂规鍚嶇О
- HDefaultFilter = data[0].鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
//杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
var HRemark = data[0].澶囨敞
//鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
@@ -1117,10 +1155,10 @@
for (let i = 0; i < data.length; i++) { //寰幆 閬嶅巻鏁版嵁闆哾ata涓殑姣忎釜鍏冪礌
$("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�); // 灏濊瘯鏇存柊椤甸潰涓奍D涓巇ata[i].杩囨护瀛楁ID鐩稿尮閰嶇殑杈撳叆妗嗙殑鍊�
if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') { // 濡傛灉褰撳墠杩囨护鏉′欢鐨勭被鍨嬫槸'SELECT'锛堝嵆涓嬫媺閫夋嫨妗嗭級
- // 鍒欐壘鍒板搴旂殑涓嬫媺閫夋嫨妗嗕腑鐨勯�夐」锛屽叾value灞炴�т笌data[i].杩囨护鍊肩浉鍖归厤 , 骞跺皢璇ラ�夐」璁剧疆涓洪�変腑鐘舵��
+ // 鍒欐壘鍒板搴旂殑涓嬫媺閫夋嫨妗嗕腑鐨勯�夐」锛屽叾value灞炴�т笌data[i].杩囨护鍊肩浉鍖归厤 , 骞跺皢璇ラ�夐」璁剧疆涓洪�変腑鐘舵��
$("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
- }
+ }
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1; // //灏嗚幏鍙栫殑涓嬫媺妗嗗��*1杞寲涓烘暟瀛楃被鍨� 璧嬪�肩粰鍙橀噺HInitTimeCycle
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -1140,7 +1178,7 @@
}
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ get_FastQuery()
form.render("select"); //閲嶆柊娓叉煋
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
@@ -1177,18 +1215,18 @@
}
//鍘婚櫎鏈熬閫楀彿 绉婚櫎鏈�鍚庝竴浣�
- HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
HValue = HValue.substring(0, HValue.length - 1);
HElement_type = HElement_type.substring(0, HElement_type.length - 1);
//褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
if (HDefaultFilter == "") { //鍒ゆ柇杩囨护鍚嶇О鏄惁涓虹┖
- layer.open({ //鎵撳紑鏂扮殑灞�
+ layer.open({ //鎵撳紑鏂扮殑灞�
type: 2 //鍙互鏄剧ず鏂扮晫闈�
, area: ['40%', '80%'] //鐣岄潰鐨勫ぇ灏�
, title: '杩囨护鏂规' //璁剧疆灞傚悕绉�
- , shift: 0 //寮瑰嚭鍔ㄧ敾
- // 缃簡涓�涓悕涓篶ontent鐨勫睘鎬� 琛ㄦ槸url鍙傛暟锛岃繖浜涙煡璇㈠弬鏁伴�氳繃JavaScript鍙橀噺锛堝HModuleName銆丠FilterIdLists銆丠Value銆丠Element_type锛夊姩鎬佹瀯寤猴紝鐢ㄤ簬鍚戠洰鏍囬〉闈紶閫掍俊鎭�
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ // 缃簡涓�涓悕涓篶ontent鐨勫睘鎬� 琛ㄦ槸url鍙傛暟锛岃繖浜涙煡璇㈠弬鏁伴�氳繃JavaScript鍙橀噺锛堝HModuleName銆丠FilterIdLists銆丠Value銆丠Element_type锛夊姩鎬佹瀯寤猴紝鐢ㄤ簬鍚戠洰鏍囬〉闈紶閫掍俊鎭�
, content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
, cancel: function () {
// 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
@@ -1198,7 +1236,7 @@
if (HIsClose_Manual != true) {//妫�鏌IsClose_Manual鍙橀噺鐨勫�硷紝濡傛灉涓嶆槸true锛堝嵆瀵硅瘽妗嗕笉鏄�氳繃鐐瑰嚮鍏抽棴鎸夐挳鍏抽棴鐨勶級
get_FastQuery();
//鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
- // 閰嶇疆涓�涓猆I缁勪欢锛堝瀵硅瘽妗嗭級鐨勶紝瀹冨寘鍚簡鍔ㄦ�佹瀯寤虹殑URL銆佸鐞嗗叧闂簨浠剁殑閫昏緫锛屼互鍙婂湪鐗瑰畾鏉′欢涓嬫樉绀哄綋鍓嶈繃婊ゆ柟妗堜俊鎭殑閫昏緫
+ // 閰嶇疆涓�涓猆I缁勪欢锛堝瀵硅瘽妗嗭級鐨勶紝瀹冨寘鍚簡鍔ㄦ�佹瀯寤虹殑URL銆佸鐞嗗叧闂簨浠剁殑閫昏緫锛屼互鍙婂湪鐗瑰畾鏉′欢涓嬫樉绀哄綋鍓嶈繃婊ゆ柟妗堜俊鎭殑閫昏緫
document.getElementById("HFilterScheme_Now").style.display = "block";
document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
}
@@ -1218,7 +1256,7 @@
, area: ['40%', '80%'] //璁剧疆鐣岄潰澶у皬
, title: '杩囨护鏂规' //璁剧疆灞傛爣棰�
, shift: 0//寮瑰嚭鍔ㄧ敾
- // 缃簡涓�涓悕涓篶ontent鐨勫睘鎬� 琛ㄦ槸url鍙傛暟锛岃繖浜涙煡璇㈠弬鏁伴�氳繃JavaScript鍙橀噺锛堝HModuleName銆丠FilterIdLists銆丠Value銆丠Element_type锛夊姩鎬佹瀯寤猴紝鐢ㄤ簬鍚戠洰鏍囬〉闈紶閫掍俊鎭�
+ // 缃簡涓�涓悕涓篶ontent鐨勫睘鎬� 琛ㄦ槸url鍙傛暟锛岃繖浜涙煡璇㈠弬鏁伴�氳繃JavaScript鍙橀噺锛堝HModuleName銆丠FilterIdLists銆丠Value銆丠Element_type锛夊姩鎬佹瀯寤猴紝鐢ㄤ簬鍚戠洰鏍囬〉闈紶閫掍俊鎭�
, content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
, end: function () {
get_FastQuery()
@@ -1256,7 +1294,7 @@
async: true, // 杩欎釜閫夐」鎸囧畾浜嗚姹傛槸鍚﹀簲璇ュ紓姝ユ墽琛�
data: { "oMain": sMainSub }, //瑕佸彂閫佺殑鏁版嵁
dataType: "json", //datatype鏁版嵁绫诲瀷涓簀son
- // 褰撹姹傛垚鍔熸椂璋冪敤鐨勫嚱鏁� 鎺ュ彈鏀朵竴涓弬鏁癲ata
+ // 褰撹姹傛垚鍔熸椂璋冪敤鐨勫嚱鏁� 鎺ュ彈鏀朵竴涓弬鏁癲ata
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 鍒ゆ柇鑾峰彇鏁扮粍鏄惁瀛樺湪count灞炴�т笖 count鏄惁绛変簬1
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }); //璁剧疆寮圭獥鏃堕棿
@@ -1325,4 +1363,5 @@
});
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 7fb914b..08ab6b6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -279,7 +279,7 @@
}
//鎵ц鏌ヨ鏂规硶
- //get_FastQuery()
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -1060,13 +1060,14 @@
option.cols = [columns];
option.data = data1.data;
option.totalRow = true;
- table.render(option);
- ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
+ ins = table.render(option);
layer.close(ajaxLoad);
//鑷畾涔夎繃婊や笅鎷夋鍔犺浇
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -1174,7 +1175,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
index 9c421a0..1308c23 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillMain_Setto.html"
@@ -403,8 +403,7 @@
$("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
//鏌ヨ
- get_Display(" and 1 = 0")
- ColFilter()
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -617,11 +616,12 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
- // if ($("#ColName option").length < 1) {
- // ColFilter();
- // get_DefaultModule();//鍔犺浇鏂规
- // }
ins = table.render(option);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
} else {
@@ -936,7 +936,7 @@
}
}
-
+
//鎵ц鏌ヨ鏂规硶
get_FastQuery()
form.render("select");
@@ -945,7 +945,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
index c4ec7d2..0ad2055 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\205\347\256\261\345\215\225/Sc_PackUnionBillMain_Packing.html"
@@ -401,8 +401,7 @@
$("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
//鏌ヨ
- get_Display(" and 1= 0")
- ColFilter()
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -614,12 +613,14 @@
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
- // if ($("#ColName option").length < 1) {
- // ColFilter();
- // get_DefaultModule();//鍔犺浇鏂规
- // }
ins = table.render(option);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -900,7 +901,7 @@
});
return Permission;
}
- //#endregion
+ //#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -940,7 +941,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
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 987939b..4e40587 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"
@@ -360,7 +360,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery(1);
+ // get_FastQuery(1);
get_DefaultModule();//鍔犺浇鏂规
@@ -1090,6 +1090,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
+ get_FastQuery(1);
form.render("select");
}
}, error: function () {
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/KF_BarCodeStatusChangeBillList.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/KF_BarCodeStatusChangeBillList.html"
index 2c3a670..5be91df 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/KF_BarCodeStatusChangeBillList.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/KF_BarCodeStatusChangeBillList.html"
@@ -62,12 +62,12 @@
<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 name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" class="ForFilteringSchemes" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -82,10 +82,10 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <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-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -113,7 +113,7 @@
</div>
</div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-row" style=" margin-top: 10px;">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -303,9 +303,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery();
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规鏃�
get_DefaultModule();
@@ -432,13 +430,16 @@
}
}
option.data = data1.data;
+ DisPlay_HideColumn();
table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ console.log($("#ColName"))
+ console.log($("#ColName1"))
+ console.log($("#ColName2"))
}
- DisPlay_HideColumn();
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1288";
@@ -461,9 +462,6 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -847,20 +845,6 @@
})
//#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>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);
- form.render('select');
- }
- //#endregion
-
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -917,7 +901,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
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\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.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\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
index a0603c0..b15b8af 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\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.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\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
@@ -237,6 +237,7 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
+ var titleData = [];
//#endregion
//#region 鍒濆鍖栫晫闈�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
index 95355f1..c41a693 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
@@ -302,12 +302,12 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
- DisPlay_HideColumn();
+ //DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ //ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -440,7 +440,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1055,7 +1055,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index d7e47ce..a80b19a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -297,11 +297,11 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ // DisPlay_HideColumn();
}
//#endregion
@@ -399,6 +399,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportStepBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -454,7 +455,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -946,7 +947,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
index c5ddffe..f36a0c0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
@@ -601,6 +601,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MaterToSourceStepBill/get锘縎c_MaterToSourceStepBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -655,10 +656,10 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -825,6 +826,7 @@
$("#ColName1").append(Organization);
$("#ColName2").empty();
$("#ColName2").append(Organization);
+
form.render('select');
}
//鏂板
@@ -1113,7 +1115,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
+ //get_FastQuery(1)
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 85242fb..a62db44 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -1222,7 +1222,7 @@
var HBillType = "3710";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -2725,6 +2725,51 @@
}
//#endregion
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ // get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//瀹℃牳
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
index ea49e6f..7a6e84b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html"
index 069dedd..162ff9d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/ProductionAnalysisReport.html"
@@ -624,9 +624,9 @@
col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
}
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ // }
else {
switch (data[i].Type) {
case 'DateTime':
@@ -736,7 +736,22 @@
sWhere = "";
set_Graphics();
}
-
+ //#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
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 5e11506..d66caf3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -803,6 +803,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ICMOReportBill/Sc_ICMOReportBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -865,7 +866,7 @@
if ($("#ColName option").length < 1) {
ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ // get_DefaultModule();
}
} else {
layer.close(ajaxLoad);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
index e945a8f..921b395 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_ProductionReturnList.html"
@@ -122,7 +122,7 @@
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <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>
@@ -430,9 +430,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_FastQuery();
+ get_FastQuery();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ //ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -534,6 +534,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProductionReturnBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -588,14 +589,18 @@
option.data = data1.data;
+ DisPlay_HideColumn();
table.render(option);
- layer.close(ajaxLoad);
- DisPlay_HideColumn();
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1245";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1245";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1148,7 +1153,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\345\257\271\345\272\224\345\231\250\345\205\267\346\270\205\345\215\225/Gy_SourceMouldList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\345\257\271\345\272\224\345\231\250\345\205\267\346\270\205\345\215\225/Gy_SourceMouldList.html"
index 638e8c7..8738441 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\345\257\271\345\272\224\345\231\250\345\205\267\346\270\205\345\215\225/Gy_SourceMouldList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\345\257\271\345\272\224\345\231\250\345\205\267\346\270\205\345\215\225/Gy_SourceMouldList.html"
@@ -955,7 +955,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
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 7a069f4..fe33f2d 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"
@@ -1078,6 +1078,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_RoutingBill/page',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -1141,14 +1142,11 @@
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
- layer.close(ajaxLoad);
-
- layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
//option.data = [[]]
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 ebb625a..029fcd3 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"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>璁惧鍚姩鐐规娓呭崟鍒楄〃</title>
@@ -19,6 +20,7 @@
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -35,76 +37,92 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
<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">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</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="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProNumber"
+ id="HProNumber">
</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="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes"
+ lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<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="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -112,26 +130,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -139,7 +164,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -147,19 +173,25 @@
<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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -167,7 +199,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -207,7 +240,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -226,7 +259,7 @@
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID", "HCheckPostID", "HOrgID","HRelationID"];
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HSourceID", "HProcID", "HCheckNoteItemID", "HCheckPostID", "HOrgID", "HRelationID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -270,7 +303,7 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
- break;
+ break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
@@ -488,7 +521,7 @@
url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/getGy_WorkBeginDotCheckListBillMainList',
type: "GET",
async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var totalArray = [];
@@ -535,11 +568,10 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- layer.close(ajaxLoad);
-
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
+ layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -713,7 +745,7 @@
, title: '璁惧鍚姩鐐规娓呭崟鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Gy_WorkBeginDotCheckListBill.html?OperationType=1&linterid=0&HSouceBillType='
- ,btn: ['纭畾'],
+ , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -863,7 +895,7 @@
}
}
-
+
//鍏抽棴/鍙嶅叧闂�
function set_CloseBills(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -895,7 +927,7 @@
}
}
-
+
//浣滃簾/鍙嶄綔搴�
function set_DropBill(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -991,6 +1023,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
type: "GET",
+ async: false,
data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
success: function (data1) {
if (data1.count == 1) {
@@ -1204,9 +1237,9 @@
});
- //#endregion
+ //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
@@ -1249,4 +1282,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
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 9d4b103..4c9b059 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"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍚姩鐐规鍒楄〃</title>
@@ -19,6 +20,7 @@
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -35,69 +37,84 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
<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">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</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="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProNumber"
+ id="HProNumber">
</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="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<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="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -105,26 +122,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -132,26 +156,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -159,7 +190,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -198,7 +230,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -219,7 +251,7 @@
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HEntryID", "HBillStatus", "HICMOInterID", "HICMOEntryID", "HProcExchInterID", "HProcExchEntryID", "HMaterID", "HSourceID", "HCheckEmpID", "HGroupID", "HGroupLeaderID", "HCheckNoteItemID","HCheckPostID"];
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HICMOInterID", "HICMOEntryID", "HProcExchInterID", "HProcExchEntryID", "HMaterID", "HSourceID", "HCheckEmpID", "HGroupID", "HGroupLeaderID", "HCheckNoteItemID", "HCheckPostID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -341,7 +373,7 @@
//#endregion
//#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
+ form.on('submit(btnSearch)', function (data) {
if (page != 1) {
$("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
} else {
@@ -350,7 +382,7 @@
});
//#endregion
-
+
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -390,11 +422,17 @@
$("#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();
-
+
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -464,7 +502,7 @@
}
})
}
- });
+ });
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
@@ -674,6 +712,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_WorkBeginDotCheckBill/get锘縎c_WorkBeginDotCheckBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -753,7 +792,7 @@
, title: '鍚姩鐐规鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=1&linterid=0&HSouceBillType='
- ,btn: ['纭畾'],
+ , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -870,7 +909,7 @@
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -885,7 +924,7 @@
}
}
-
+
//鍏抽棴/鍙嶅叧闂�
function set_CloseBills(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -901,7 +940,7 @@
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -916,7 +955,7 @@
}
}
-
+
//浣滃簾/鍙嶄綔搴�
function set_DropBill(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -931,7 +970,7 @@
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -947,8 +986,8 @@
}
//#endregion
-
-
+
+
//#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
function ColFilter() {
@@ -1059,11 +1098,11 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
//鏌ヨ
- if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
- get_FastQuery(2);
- } else {
- get_FastQuery(1);
- }
+ // if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ // get_FastQuery(2);
+ // } else {
+ // get_FastQuery(1);
+ // }
form.render("select");
}
}, error: function () {
@@ -1236,9 +1275,9 @@
});
- //#endregion
+ //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
@@ -1276,10 +1315,11 @@
}
});
}
-
+
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 91b5530..da79faf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -2038,7 +2038,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
index d66f9c4..9ce1a0a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
@@ -38,7 +38,7 @@
<div class="layui-form-item layui-inline">
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ <input type="text" class="layui-input " id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
</div>
<label class="layui-form-label" style="width:25px">-</label>
<div class="layui-input-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
index 58beea9..798368f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcExchangeNoInReport.html"
@@ -38,7 +38,7 @@
<div class="layui-form-item layui-inline">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:5px;">-</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcessErrStationReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcessErrStationReport.html"
index cf974f3..1933e36 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcessErrStationReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_ProcessErrStationReport.html"
@@ -38,19 +38,19 @@
<div class="layui-inline" style="width:200px;">
<label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
<div class="layui-input-block" style="position:relative; left:-45px;">
- <input type="date" class="layui-input" id="HBeginDate" style="width:140px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:140px;">
</div>
</div>
<div class="layui-inline" style="width:200px;">
<label class="layui-form-label" style="width:5px;">-</label>
<div class="layui-input-block" style="position:relative; left:-70px;">
- <input type="date" class="layui-input" id="HEndDate" style="width:140px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:140px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width:50px;">宸ュ簭</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="float: left; width: 190px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="float: left; width: 190px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HProcID" id="HProcID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcID" id="btnHProcID" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -78,7 +78,7 @@
<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="HICMOBillNo" id="HICMOBillNo" onfocus="this.select();">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
index d19b2a4..1ab251b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMRKReport.html"
@@ -38,7 +38,7 @@
<div class="layui-form-item layui-inline">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="layui-inline">
<label class="layui-form-label">-</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
+ <input type="text" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
index 0323b3b..5883779 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
@@ -38,7 +38,7 @@
<div class="layui-form-item layui-inline">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="layui-inline">
<label class="layui-form-label">-</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\345\234\250\345\210\266\345\223\201\346\234\237\345\210\235\345\215\225/CJ_WIPBeginStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\345\234\250\345\210\266\345\223\201\346\234\237\345\210\235\345\215\225/CJ_WIPBeginStockBillList.html"
index 72c9bd4..a98a3a0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\345\234\250\345\210\266\345\223\201\346\234\237\345\210\235\345\215\225/CJ_WIPBeginStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\350\275\246\351\227\264\345\234\250\345\210\266\345\223\201\346\234\237\345\210\235\345\215\225/CJ_WIPBeginStockBillList.html"
@@ -60,7 +60,7 @@
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <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>
@@ -82,12 +82,12 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ <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" lay-filter="Comparator1" style="width:190px;">
+ <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>
@@ -102,19 +102,19 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <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" lay-filter="ColName2" style="width:190px;">
+ <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" lay-filter="Comparator2" style="width:190px;">
+ <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>
@@ -129,7 +129,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -375,6 +375,7 @@
$.ajax({
url: GetWEBURL() + '/CJ_WIPBeginStockBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -934,7 +935,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
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 82793ce..265a165 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"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>闃查敊楠岃瘉妫�鏌�</title>
@@ -19,6 +20,7 @@
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -35,69 +37,84 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
<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">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</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="HProNumber" id="HProNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProNumber"
+ id="HProNumber">
</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="HName" id="HName">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+ id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<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="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -105,26 +122,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -132,7 +156,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -140,19 +165,25 @@
<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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -160,7 +191,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -200,7 +232,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -221,7 +253,7 @@
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID","HCheckEmpID", "HPreventErrMouldID"];
+ var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HCheckEmpID", "HPreventErrMouldID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -392,7 +424,12 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
-
+
+ if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+ get_FastQuery(2);
+ } else {
+ get_FastQuery(1);
+ }
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -463,7 +500,7 @@
})
}
});
- //#endregion
+ //#endregion
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
@@ -669,6 +706,7 @@
$.ajax({
url: GetWEBURL() + '/Qc_PreventErrMouldCheckBill/get锘縌c_PreventErrMouldCheckBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -748,7 +786,7 @@
, title: '宸ヤ綔浠诲姟鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../杞﹂棿绠＄悊/闃查敊楠岃瘉/Qc_PreventErrMouldCheckBill.html?OperationType=1&linterid=0&HSouceBillType='
- ,btn: ['纭畾'],
+ , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
//鍒锋柊椤甸潰
@@ -864,7 +902,7 @@
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -879,7 +917,7 @@
}
}
-
+
//鍏抽棴/鍙嶅叧闂�
function set_CloseBills(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -894,7 +932,7 @@
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -909,7 +947,7 @@
}
}
-
+
//浣滃簾/鍙嶄綔搴�
function set_DropBill(nums) {
var checkStatus = table.checkStatus('mainTable')
@@ -924,7 +962,7 @@
data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
+ layer.msg(result.Message, { icon: 1 });
get_FastQuery();
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -939,7 +977,7 @@
}
}
//#endregion
-
+
//#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
function ColFilter() {
@@ -1049,11 +1087,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
//鏌ヨ
- if (addSWhereByOpenType()) { //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
- get_FastQuery(2);
- } else {
- get_FastQuery(1);
- }
+
form.render("select");
}
}, error: function () {
@@ -1226,9 +1260,9 @@
});
- //#endregion
+ //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
@@ -1271,4 +1305,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index 83130e4..77115c8 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>浠樻鍗曠淮鎶�</title>
@@ -18,6 +19,7 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -34,60 +36,74 @@
<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">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">椤圭洰缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber"
+ id="HProjectNumber" style="width:190px;">
</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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<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="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ class="ForFilteringSchemes" 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -95,63 +111,77 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</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="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <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" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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>
- <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 class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</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 class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <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" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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>
@@ -210,7 +240,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) || document.title;
+ var HPageTitle = get_PageTitle(HModuleType) || document.title;
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -401,7 +431,7 @@
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery();
-
+
});
//#endregion
@@ -409,7 +439,7 @@
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
get_FastQuery();
-
+
});
//#endregion
@@ -455,9 +485,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -528,25 +558,25 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/YF_PayMentBill/list',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
var col = [];
- var totalArray = ["鎶樻墸鍚庨噾棰�", "琛ㄥご閲戦鏈綅甯�", "鎶樻墸鍚庨噾棰濇湰浣嶅竵","鏁伴噺","鍗曟嵁閲戦"];
+ 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: '鍚堣' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -558,12 +588,13 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
- } else {
+ }, style: 'cursor: pointer;'
+ });
+ } 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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
@@ -583,7 +614,7 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
-
+
}
}
option.cols = [col];
@@ -670,9 +701,11 @@
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option)
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -700,12 +733,14 @@
//浠绘剰瀛楁杩囨护
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val(); var ColName = $("#ColName1").val();//澶嶉�夋
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val(); var ColName = $("#ColName2").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) {
@@ -764,7 +799,7 @@
com2 = "not like'%" + ColContent2 + "%'";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -816,7 +851,7 @@
, title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../閲囪喘绠＄悊/浠樻鍗�/YF_PayMentBill.html?OperationType=1&linterid=0&HSouceBillType='
- ,btn: ['纭畾'],
+ , btn: ['纭畾'],
end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btnSearch").trigger('click');
@@ -989,7 +1024,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ $("#btnSearch").trigger('click');
});
} else {
@@ -1226,10 +1261,10 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "HAccSupID", "HBankID", "hssid", "hcurid", "HDeptID", "HManagerID", "hempid", "hsubid", "HMaterID", "hunitid", "hsupid","HBillType","HOrgID","鐗╂枡浠ｇ爜","璁￠噺鍗曚綅浠ｇ爜","涓氬姟鍛樹唬鐮�","涓氬姟鍗曚綅浠ｇ爜","缁撶畻鍗曚綅浠ｇ爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["hmainid", "HAccSupID", "HBankID", "hssid", "hcurid", "HDeptID", "HManagerID", "hempid", "hsubid", "HMaterID", "hunitid", "hsupid", "HBillType", "HOrgID", "鐗╂枡浠ｇ爜", "璁￠噺鍗曚綅浠ｇ爜", "涓氬姟鍛樹唬鐮�", "涓氬姟鍗曚綅浠ｇ爜", "缁撶畻鍗曚綅浠ｇ爜"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
dataCol = data1.data[0].HGridString.split(',');
-
+
for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol.length <= i) {
break;
@@ -1326,8 +1361,10 @@
}
}
$("#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');
}
@@ -1576,9 +1613,9 @@
//#endregion
});
- //#endregion
+ //#endregion
- //浠ヤ笂鏄痩ayui妯″潡
+ //浠ヤ笂鏄痩ayui妯″潡
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
@@ -1620,4 +1657,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
index f6adad8..a37fd11 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillQuery.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>浠樻鍗曟煡璇�</title>
@@ -42,43 +43,51 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HEmpName" id="HEmpName" style="width:190px;">
</div>
</div>
</div>
@@ -87,19 +96,25 @@
<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" 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -107,7 +122,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -115,19 +131,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -135,7 +157,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -143,19 +166,25 @@
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -163,7 +192,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -215,7 +245,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -364,7 +394,7 @@
set_ClearQuery();
});
- table.on('tool(mainTable)' , function (obj) {
+ table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.hmainid.toString();
@@ -391,7 +421,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -434,7 +464,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -465,7 +495,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , cols:[[]]
+ , cols: [[]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -479,8 +509,8 @@
$.ajax({
url: GetWEBURL() + '/YF_PayMentBill/QueryList',
type: "GET",
- async:"false",
- data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -498,7 +528,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -518,11 +548,11 @@
return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
}, style: 'cursor: pointer;'
});
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name +", 'yyyy-MM-dd'")+")}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name + ", 'yyyy-MM-dd'") + ")}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -532,14 +562,17 @@
option.cols = [col];
option.data = data1.data;
+ DisPlay_HideColumn();
table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1103";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -568,7 +601,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
titleData = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -688,30 +721,30 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
/*if (data[0].鐘舵�� == "鍒涘缓") {*/
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/YF_PayMentBill/delete", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/YF_PayMentBill/delete", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
-
- }, error: function () {
-
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
+
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
//} else {
// layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
@@ -1049,7 +1082,7 @@
//蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1450,7 +1483,7 @@
});
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
-
+
})
@@ -1575,7 +1608,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1818,4 +1851,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
index d4ca387..e6f0e03 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
@@ -387,7 +387,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -519,7 +519,7 @@
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1036,7 +1036,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index be81292..ca3e5a1 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -468,13 +468,13 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option)
+ get_FastQuery(table, option)
//鍔犺浇涓氬姟鍛�
get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
+ // DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -630,6 +630,7 @@
$.ajax({
url: GetWEBURL() + '/WW_EntrustOrderBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],},
success: function (data1) {
if (data1.count == 1) {
@@ -685,6 +686,11 @@
DataList = data1.data;
option.data = data1.data;
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
+
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -1456,6 +1462,7 @@
//#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
function ColFilter() {
+ console.log(option.cols)
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) {
@@ -1694,7 +1701,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 3bb0256..2fff966 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -457,9 +457,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -653,9 +653,12 @@
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option)
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -690,21 +693,22 @@
var ColName2 = $("#ColName2").val();//澶嶉�夋
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
+ console.log(ColName, ColName1, ColName2)
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 + "'";
@@ -716,16 +720,16 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like '%" + ColContent1 + "'";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like '" + ColContent1 + "%'";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like '%" + ColContent1 + "%'";
break;
default:
com1 = "" + Comparator1 + "'" + ColContent1 + "'";
@@ -737,16 +741,16 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like '%" + ColContent2 + "'";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like '" + ColContent2 + "%'";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like '%" + ColContent2 + "%'";
break;
default:
com2 = "" + Comparator2 + "'" + ColContent2 + "'";
@@ -1411,7 +1415,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
index 71b6463..62ae6f0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>搴斾粯鍗曟煡璇�</title>
@@ -42,49 +43,58 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HEmpName" id="HEmpName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
</div>
@@ -93,19 +103,25 @@
<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" 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -113,7 +129,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -121,19 +138,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -141,7 +164,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -149,19 +173,25 @@
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -169,7 +199,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -220,7 +251,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -242,7 +273,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1114";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
- var HPageTitle = get_PageTitle(HModuleType) || document.title;
+ var HPageTitle = get_PageTitle(HModuleType) || document.title;
//#endregion
////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -369,7 +400,7 @@
set_ClearQuery();
});
- table.on('tool(mainTable)' , function (obj) {
+ table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.hmainid.toString();
@@ -396,7 +427,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -439,7 +470,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -470,7 +501,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , cols:[[]]
+ , cols: [[]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -485,7 +516,7 @@
url: GetWEBURL() + '/Cg_PayableBill/QueryList',
type: "GET",
async: false,
- data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -503,7 +534,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -523,7 +554,7 @@
return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
}, style: 'cursor: pointer;'
});
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -537,13 +568,13 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -573,7 +604,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
titleData = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -1026,7 +1057,7 @@
//蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1434,7 +1465,7 @@
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
-
+
})
@@ -1559,7 +1590,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1802,4 +1833,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
index 9da23ab..f197d54 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillList.html"
@@ -87,12 +87,12 @@
<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 name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -107,7 +107,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -350,7 +350,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鏌ヨ
- // get_Display("");
+ get_FastQuery();
//鍒濆鍖栬〃鏍�
//DisPlay_HideColumn();
@@ -364,6 +364,7 @@
$.ajax({
url: GetWEBURL() + '/Sup_QuotePriceBill/Sup_QuotePriceBillList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -419,7 +420,7 @@
DisPlay_HideColumn();
table.render(option);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -457,16 +458,16 @@
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 + "'";
@@ -478,16 +479,16 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like '%" + ColContent1 + "'";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like '" + ColContent1 + "%'";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like '%" + ColContent1 + "%'";
break;
default:
com1 = "" + Comparator1 + "'" + ColContent1 + "'";
@@ -499,16 +500,16 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like '%" + ColContent2 + "'";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like '" + ColContent2 + "%'";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like '%" + ColContent2 + "%'";
break;
default:
com2 = "" + Comparator2 + "'" + ColContent2 + "'";
@@ -903,7 +904,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 9a2d8c8..602a770 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鏉ユ枡閫氱煡鍗曞垪琛�</title>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -42,26 +44,30 @@
<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 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="HDate" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate"
+ 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="HDate1" style="width:190px;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -75,19 +81,23 @@
<div class="layui-inline" style="display:none;">
<label class="layui-form-label">椤圭洰缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber"
+ id="HProjectNumber" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2"
+ id="HBillno2" style="width:190px;">
</div>
</div>
<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px; display: none; ">閲嶆柊鍚屾</button>-->
@@ -95,7 +105,8 @@
<div class="layui-row">
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
</div>
<div class="layui-colla-content">
@@ -107,19 +118,22 @@
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupID" id="HSupID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupID"
+ id="HSupID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID"
+ id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID"
+ id="HMangerID" style="width:190px;">
</div>
</div>
</div>
@@ -128,19 +142,25 @@
<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" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes"
+ 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -148,26 +168,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -175,26 +202,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -202,7 +236,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -288,10 +323,10 @@
window.HInterID_Choose = 0;
//#endregion
-
+
//鍒濆鍖栫晫闈�
set_ClearBill();
-
+
//#endregion
//閲嶆柊鍚屾鎸夐挳
@@ -305,7 +340,7 @@
set_ClearQuery();
optionPage.curr = 1;
get_FastQuery();
-
+
});
//#endregion
@@ -313,7 +348,7 @@
form.on('submit(btnSearch)', function (data) {
optionPage.curr = 1;
get_FastQuery(table, option, 2);
-
+
});
//#endregion
@@ -390,7 +425,7 @@
})
}
});
- //#endregion
+ //#endregion
//鑾峰彇缁勭粐
Organ();
@@ -417,9 +452,9 @@
//鍒濆鍖栭〉澶у皬
// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(1)
+ get_FastQuery(1)
-
+
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
@@ -445,27 +480,27 @@
}
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { field: 'hmainid', title: 'hmainid', sort: true, hide: true}
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true}
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true}
- , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true}
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
, { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
- , { field: 'HSupID', title: 'HSupID', width: 120, hide: true, sort: true}
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120, sort: true}
+ , { field: 'HSupID', title: 'HSupID', width: 120, hide: true, sort: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120, sort: true }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150, sort: true }
- , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true}
- , { field: 'HCurID', title: 'HCurID', width: 120, hide: true, sort: true}
+ , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
+ , { field: 'HCurID', title: 'HCurID', width: 120, hide: true, sort: true }
, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
, { field: '甯佸埆', title: '甯佸埆', sort: true }
- , { field: '姹囩巼', title: '姹囩巼', sort: true}
- , { field: 'HDeptID', title: 'HDeptID', width: 120, hide: true, sort: true}
+ , { field: '姹囩巼', title: '姹囩巼', sort: true }
+ , { field: 'HDeptID', title: 'HDeptID', width: 120, hide: true, sort: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 150, sort: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true }
- , { field: 'HManagerID', title: 'HManagerID', width: 120, hide: true, sort: true}
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true}
+ , { field: 'HManagerID', title: 'HManagerID', width: 120, hide: true, sort: true }
+ , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
, { field: '涓荤', title: '涓荤', sort: true }
- , { field: 'HEmpID', title: 'HEmpID', width: 120, hide: true, sort: true}
+ , { field: 'HEmpID', title: 'HEmpID', width: 120, hide: true, sort: true }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 120, sort: true }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
, { field: '鎽樿', title: '鎽樿', sort: true }
@@ -481,16 +516,16 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 150, sort: true , hide: true}
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 150, sort: true, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150, sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: 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, totalRow: true }
, { field: '绋庣巼', title: '绋庣巼', sort: true }
, { field: '绋庨', title: '绋庨', sort: true }
, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
- , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 150, sort: true , hide: true}
+ , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 150, sort: true, hide: true }
, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', sort: true }
, { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', sort: true, hide: true }
@@ -498,19 +533,19 @@
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, sort: true }
, { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 125, sort: true }
, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 125, sort: true }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, sort: true , templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, sort: true , templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true}
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, sort: true , templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125, sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, sort: true , templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
- , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, sort: true , templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, sort: true, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
]]
};
@@ -541,7 +576,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/list',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -564,7 +599,8 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -620,6 +656,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/page',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -627,7 +664,7 @@
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺","鍏宠仈鏁伴噺","閲戦","绋庨","浠风◣鍚堣"];
+ 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 });
@@ -675,8 +712,9 @@
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1103";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -795,11 +833,11 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
- //澶氳涓嬫帹(閲囪喘鍏ュ簱鍗�)
+ //澶氳涓嬫帹(閲囪喘鍏ュ簱鍗�)
case 'btn-PushPOStockInBills':
set_PushPOStockInBills();
break;
- //瀹℃牳
+ //瀹℃牳
case 'set_CheckBill': set_CheckBill(0);
break;
//鍙嶅鏍�
@@ -820,11 +858,11 @@
//椹冲洖
case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
break;
- //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+ //鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn-Close':
set_CloseBill(1);
break;
- //琛屽叧闂�
+ //琛屽叧闂�
case 'set_CloseRow': set_CloseRow(0);
break;
//琛屽弽鍏抽棴
@@ -922,7 +960,7 @@
//#endregion
- //#region 澶氳涓嬫帹锛堥噰璐叆搴撳崟锛�
+ //#region 澶氳涓嬫帹锛堥噰璐叆搴撳崟锛�
function set_PushPOStockInBills() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -945,8 +983,8 @@
return;
}
- if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ if (data[i].琛岀姸鎬� != "") {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1002,7 +1040,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cg_POInStockBill/StartCheckFlow_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID,"CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1141,7 +1179,7 @@
//#endregion
- //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1177,7 +1215,7 @@
}
//#endregion
- //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+ //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1213,7 +1251,7 @@
}
//#endregion
- //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
+ //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
function set_CloseRow(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1287,7 +1325,7 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -1310,16 +1348,16 @@
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 + "'";
@@ -1329,18 +1367,19 @@
}
if (ColName1 != 0 && Comparator1 != 0) {
var com1 = "";
+
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like '%" + ColContent1 + "'";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like '" + ColContent1 + "%'";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like '%" + ColContent1 + "%'";
break;
default:
com1 = "" + Comparator1 + "'" + ColContent1 + "'";
@@ -1352,16 +1391,16 @@
var com2 = "";
switch (Comparator) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like '%" + ColContent2 + "'";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like '" + ColContent2 + "%'";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like '%" + ColContent2 + "%'";
break;
default:
com2 = "" + Comparator2 + "'" + ColContent2 + "'";
@@ -1469,12 +1508,12 @@
var hmainid = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- if (checkStatus.data[i].鐘舵�� != "宸插鏍�" && checkStatus.data[i].鐘舵��!="") {
+ if (checkStatus.data[i].鐘舵�� != "宸插鏍�" && checkStatus.data[i].鐘舵�� != "") {
layer.alert("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!", { icon: 5 });
return;
}
- hmainid.push(data[i].hmainid.toString() + padStart(data[i].hsubid.toString(),8))
+ hmainid.push(data[i].hmainid.toString() + padStart(data[i].hsubid.toString(), 8))
}
layer.open({
type: 2
@@ -1501,7 +1540,7 @@
function get_PrintReport1() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length != 1 ) {
+ if (checkStatus.data.length != 1) {
return layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
}
else {
@@ -1759,7 +1798,7 @@
// if (dataCol[i]) {
// var dataCols = dataCol[i].split('|');
// }
-
+
// //闅愯棌鍒�
// if (dataCols[1] == 1) {
// option.cols[0][i + 1]["hide"] = true;
@@ -1933,7 +1972,7 @@
}
}
table.render(option);
-
+
} else {
table.render(option);
}
@@ -1957,8 +1996,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');
}
@@ -2038,7 +2077,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -2208,7 +2247,7 @@
//#endregion
- //#region 鑾峰彇鍙傛暟
+ //#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -2283,4 +2322,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
index 94e258d..6059dce 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
@@ -460,7 +460,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -564,8 +564,9 @@
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -1628,9 +1629,9 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- ////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
- form.render("select");
+ // 鎵ц鏌ヨ鏂规硶
+ // get_FastQuery()
+ // form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
index 1b411d2..810a609 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta charset="utf-8" />
<title>渚涘簲鍟嗚浠峰崟鍒楄〃</title>
@@ -14,6 +15,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -30,35 +32,42 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style=" margin-bottom: 10px;">
@@ -73,13 +82,15 @@
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterName" id="HMaterName">
</div>
</div>
</div>
@@ -87,19 +98,25 @@
<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 name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes"
+ style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes"
+ 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -107,26 +124,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <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 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -134,26 +158,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <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 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -161,7 +192,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -186,6 +218,7 @@
</div>
</div>
</body>
+
</html>
<script>
layui.config({
@@ -205,7 +238,7 @@
, laydate = layui.laydate
, soulTable = layui.soulTable
var sWhere = "";
- var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID","HUnitID"];
+ var titleData = ["hmainid", "hentryid", "HEntryID", "HDeptID", "HMaterID", "HSupID", "HEmpID", "HPayConditionID", "HCurID", "HUnitID"];
var option = [];
var HModName = "Sup_AskPriceBillList";
@@ -215,7 +248,7 @@
var HModuleType = "1506";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
- //#endregion
+ //#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -228,7 +261,7 @@
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
- //#endregion
+ //#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -321,7 +354,7 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鏌ヨ
- // get_Display("");
+ get_FastQuery()
//鍒濆鍖栬〃鏍�
//DisPlay_HideColumn();
@@ -356,7 +389,7 @@
})
}
});
- //#endregion
+ //#endregion
// 鏌ヨ
function get_Display(sWhere) {
@@ -364,6 +397,7 @@
$.ajax({
url: GetWEBURL() + '/Sup_AskPriceBill/Sup_AskPriceBillList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -388,7 +422,8 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -419,7 +454,7 @@
DisPlay_HideColumn();
table.render(option);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -452,21 +487,22 @@
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 + "%'";
+ 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 + "'";
@@ -478,16 +514,16 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like '%" + ColContent1 + "%'";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like '%" + ColContent1 + "'";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like '" + ColContent1 + "%'";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like '%" + ColContent1 + "%'";
break;
default:
com1 = "" + Comparator1 + "'" + ColContent1 + "'";
@@ -499,16 +535,16 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like '%" + ColContent2 + "%'";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like '%" + ColContent2 + "'";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like '" + ColContent2 + "%'";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like '%" + ColContent2 + "%'";
break;
default:
com2 = "" + Comparator2 + "'" + ColContent2 + "'";
@@ -572,7 +608,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- ,title: '鏂板' + HPageTitle
+ , title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../璇环鍗�/Sup_AskPriceBillEdit.html?OperationType=1&linterid='
, end: function () {
@@ -669,7 +705,7 @@
}
});
})
- //#endregion
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -848,7 +884,7 @@
$("#HInitTimeCycle").val("29");
}
- //#endregion
+ //#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -892,7 +928,7 @@
//鎵ц鏌ヨ鏂规硶
- // get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -906,7 +942,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1074,7 +1110,7 @@
})
}
- //#endregion
+ //#endregion
//#endregion
@@ -1082,42 +1118,42 @@
//浠ヤ笂鏄痩ayui妯″潡
});
- //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
- function HFilterScheme(obj) //杩斿洖杩囨护鏂规
- {
- var HInterID = obj[0].hmainid;
- HInterID_Choose = obj[0].hmainid;
- $.ajax({
- url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
- type: "GET",
- data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
- success: function (data1) {
- if (data1.count == 1) {
- var data = data1.data;
- //璧嬪�艰繃婊ゆ柟妗堝悕绉�
- HDefaultFilter = data[0].鏂规鍚嶇О
- var HRemark = data[0].澶囨敞
- //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
- document.getElementById("HFilterScheme_Now").style.display = "block";
- document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
- HInterID = data[0].hmainid
- //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
- for (let i = 0; i < data.length; i++) {
- $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
- if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
- $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
- }
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
-
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
}
- }, error: function () {
+
+ } else {
layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
- });
- }
- //#endregion
-</script>
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index 5e741f7..de6c77c 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閫�鏂欓�氱煡鍗曞垪琛�</title>
@@ -26,6 +27,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -42,26 +44,30 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -72,23 +78,29 @@
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-row">
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
</div>
<div class="layui-inline" style="display:none;">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2"
+ id="HBillno2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px; display: none;">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnReSearch"
+ style="padding: 0 5px; display: none;">閲嶆柊鍚屾</button>
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -98,19 +110,22 @@
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupID" id="HSupID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupID"
+ id="HSupID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID"
+ id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID"
+ id="HMangerID" style="width:190px;">
</div>
</div>
</div>
@@ -119,19 +134,25 @@
<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" class="ForFilteringSchemes"
+ lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -139,26 +160,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -166,26 +194,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -193,7 +228,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -260,7 +296,7 @@
//#endregion
var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID", "HSPID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //#region 銆愯繃婊ゆ柟妗堛��
+ //#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -305,7 +341,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=3&linterid='+linterid+'&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: '../../閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
@@ -317,12 +353,12 @@
})
}
});
- //#endregion
+ //#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//#endregion
@@ -370,11 +406,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(1)
+ get_FastQuery(1)
//闅愯棌鍕鹃�夊瓧娈�
// DisPlay_HideColumn();
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -394,12 +428,12 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
- , { field: 'hmainid', title: 'hmainid', sort: true, hide: true}
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
- , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true}
+ , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
, { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 125, sort: true }
, { field: 'HSupID', title: 'HSupID', width: 120, hide: true, sort: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 150, sort: true, hide: true }
@@ -413,7 +447,7 @@
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 150, sort: true, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true }
, { field: 'HManagerID', title: 'HManagerID', width: 120, hide: true, sort: true }
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true , hide: true}
+ , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true, hide: true }
, { field: '涓荤', title: '涓荤', sort: true }
, { field: 'HEmpID', title: 'HEmpID', width: 120, hide: true, sort: true }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 120, sort: true, hide: true }
@@ -434,12 +468,12 @@
, { field: '鍗曚环', title: '鍗曚环', sort: true }
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '绋庣巼', title: '绋庣巼', sort: true }
- , { field: '绋庨', title: '绋庨', sort: true}
+ , { field: '绋庨', title: '绋庨', sort: true }
, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
, { field: '閫�鏂欎粨搴撲唬鐮�', title: '閫�鏂欎粨搴撲唬鐮�', width: 150, sort: true, hide: true }
, { field: '閫�鏂欎粨搴�', title: '閫�鏂欎粨搴�', sort: true }
, { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
- , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', sort: true , hide: true}
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', sort: true, hide: true }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', sort: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, sort: true }
, { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 125, sort: true }
@@ -463,10 +497,11 @@
}
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) { //瀹氫箟鍔犺浇鍙橀噺
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({ //璇锋眰鏂规硶
url: GetWEBURL() + '/Cg_POInStockBackBill/list', //璇锋眰鏁版嵁
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] }, //閫掕繘璇锋眰鍙傛暟
success: function (data1) {
if (data1.count == 1) {
@@ -490,7 +525,8 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -519,14 +555,20 @@
}
}
option.data = data1.data;
- table.render(option);
+
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1105";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -594,18 +636,18 @@
}
break;
-
+
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
- //澶氳涓嬫帹(閲囪喘閫�鏂欏崟)
+ //澶氳涓嬫帹(閲囪喘閫�鏂欏崟)
case 'btn-PushPOStockInBackBills':
set_PushPOStockInBackBills();
break;
- //瀹℃牳
+ //瀹℃牳
case 'set_CheckBill': set_CheckBill(0);
break;
//鍙嶅鏍�
@@ -619,7 +661,7 @@
case 'btn-DeClose':
set_CloseBill(2);
break;
- //琛屽叧闂�
+ //琛屽叧闂�
case 'set_CloseRow': set_CloseRow(0);
break;
//琛屽弽鍏抽棴
@@ -683,7 +725,7 @@
//#region 蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -896,7 +938,7 @@
}
}
//#endregion
-
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
@@ -916,7 +958,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cg_POInStockBackBill/DeltetCg_POInStockBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -966,8 +1008,8 @@
return;
}
- if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ if (data[i].琛岀姸鎬� != "") {
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1041,8 +1083,8 @@
}
}
//#endregion
-
-
+
+
//#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
@@ -1078,9 +1120,9 @@
}
}
//#endregion
-
-
- //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
+
+
+ //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
function set_CloseRow(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1369,7 +1411,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1570,7 +1612,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
- //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
var HInterID = obj[0].hmainid;
@@ -1613,4 +1655,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 16bfbd4..cb414fd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -925,14 +925,18 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
// 鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"],optionPage);
+ // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"],optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
// get_FastQuery(table, option, 1)
//鍔犺浇涓氬姟鍛�
//get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
- /*DisPlay_HideColumn();*/
+ // DisPlay_HideColumn()
+ DisPlay_HideColumn();
+
+ ColFilter()
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -1307,8 +1311,9 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index 96221ec..f1d0ed0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閲囪喘璁㈠崟鏌ヨ</title>
@@ -19,6 +20,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/layui-common-custom.js"></script>
+ <script src="../../../layuiadmin/setColumn.js"></script>
<style type="text/css">
.layui-table-click {
background: #ceedfa;
@@ -43,79 +45,98 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HEmpName" id="HEmpName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnzManual" id="btnResCnzManual" style="padding:0 5px">鎵嬪伐鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnzManual" id="btnResCnzManual"
+ style="padding:0 5px">鎵嬪伐鍚屾</button>
</div>
<div class="layui-inline">
<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="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -123,7 +144,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -131,19 +153,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -151,7 +179,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -159,19 +188,25 @@
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -179,7 +214,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -231,7 +267,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -391,7 +427,7 @@
get_ResCnzManual(layer, HBillType, get_FastQuery)
})
- table.on('tool(mainTable)' , function (obj) {
+ table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.hmainid.toString();
@@ -418,7 +454,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -461,8 +497,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
-
+ get_FastQuery(table, option, 1)
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -492,7 +528,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , cols:[[]]
+ , cols: [[]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -507,7 +543,7 @@
url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
type: "GET",
async: false,
- data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -525,7 +561,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -545,11 +581,11 @@
return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
}, style: 'cursor: pointer;'
});
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name +", 'yyyy-MM-dd'")+")}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name + ", 'yyyy-MM-dd'") + ")}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -564,9 +600,9 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -595,7 +631,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
titleData = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -715,30 +751,30 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
/*if (data[0].鐘舵�� == "鍒涘缓") {*/
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
-
- }, error: function () {
-
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
+
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
//} else {
// layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
@@ -1073,7 +1109,7 @@
//蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1217,7 +1253,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/Cg_POOrderBillViewApi',
type: "GET",
- data: { "BillNo": HBillno2,"BillType":1102 },
+ data: { "BillNo": HBillno2, "BillType": 1102 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1507,7 +1543,7 @@
});
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
-
+
})
//瀛愯〃鍗曢��
table.on('row(mainTableSub)', function (obj) {
@@ -1533,7 +1569,7 @@
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- });
+ });
//#endregion
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
@@ -1629,8 +1665,8 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- ////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery()
//form.render("select");
}
}, error: function () {
@@ -1873,4 +1909,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
index d8002f2..82414bc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Cg_POOrderChangeBillList.html"
@@ -411,7 +411,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -514,7 +514,7 @@
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1029,7 +1029,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
index 1654f90..1812f4d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\260\203\344\273\267\345\215\225/Cg_POStockInChangeBillList.html"
@@ -405,7 +405,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -508,11 +508,11 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
ins = table.render(option);
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -983,7 +983,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
index f574a45..7d62ce9 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\344\277\241\347\224\250\351\242\235\345\272\246\347\224\263\350\257\267\345\215\225/Xs_CusRatingChangeBillList.html"
@@ -72,12 +72,12 @@
<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 name="ColName" class="ForFilteringSchemes" 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;">
+ <select name="Comparator" class="ForFilteringSchemes" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -92,7 +92,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <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;">
@@ -407,7 +407,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -463,6 +463,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_CusRatingChangeBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -519,14 +520,14 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
+
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1172,7 +1173,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
index 71d38cc..e683c5f 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMainList.html"
@@ -402,7 +402,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -523,16 +523,15 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -1117,7 +1116,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
index 57b8aab..81b7270 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225/Xs_OutDoorCheckBillList.html"
@@ -256,7 +256,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鑾峰彇鏁版嵁
- // get_FastQuery();
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -892,15 +892,15 @@
option.cols = [columns];
option.data = data1.data;
option.totalRow = true;
- table.render(option);
- ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
- layer.close(ajaxLoad);
+ table.render(option);
+ ins = table.render(option);
//鑷畾涔夎繃婊や笅鎷夋鍔犺浇
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.Message, { icon: 5 });
@@ -1005,7 +1005,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
index e2ad1d4..6d92355 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\207\272\351\227\250\347\241\256\350\256\244\345\215\225_\346\226\260/Xs_OutDoorBillList.html"
@@ -406,7 +406,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -545,14 +545,14 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
+
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == ""&&$("#Comparator1").val() == 0 && $("#ColContent1").val() == ""&&$("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index c3dd86a..ad12946 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -373,10 +373,8 @@
//鍒濆鍖栭〉澶у皬
// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
- // get_FastQuery(table, option);
+ get_FastQuery(table, option);
// DisPlay_HideColumn();
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -661,7 +659,7 @@
// Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1710,7 +1708,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
index 8cb4f54..196f331 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鍙戣揣閫氱煡鍗曟煡璇�</title>
@@ -42,83 +43,101 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HCusID" id="HCusID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCusID"
+ id="HCusID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HDeptID" id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMangerID" id="HMangerID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HBillno2" id="HBillno2" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
</div>
<div class="layui-inline">
<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="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ <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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -126,7 +145,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -134,19 +154,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -154,7 +180,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -162,19 +189,25 @@
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -182,7 +215,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -234,7 +268,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -386,7 +420,7 @@
set_ClearQuery();
});
- table.on('tool(mainTable)' , function (obj) {
+ table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.hmainid.toString();
@@ -413,7 +447,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -456,7 +490,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -487,7 +521,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , cols:[[]]
+ , cols: [[]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -502,7 +536,7 @@
url: GetWEBURL() + '/Xs_SeOutStockBill/QueryList',
type: "GET",
async: false,
- data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -520,7 +554,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -540,11 +574,11 @@
return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
}, style: 'cursor: pointer;'
});
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name +", 'yyyy-MM-dd'")+")}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "鏃ユ湡" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name + ", 'yyyy-MM-dd'") + ")}}</div>", width: 200 });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -554,13 +588,15 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
+
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -590,7 +626,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
titleData = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -710,30 +746,30 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
/*if (data[0].鐘舵�� == "鍒涘缓") {*/
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "HsupId": 0, "HQty": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "HsupId": 0, "HQty": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
-
- }, error: function () {
-
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
+
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
//} else {
// layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
@@ -1068,7 +1104,7 @@
//蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1216,7 +1252,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOutStockBill/Xs_SeOutStockBillViewApi',
type: "GET",
- data: { "BillNo": HBillno2,"BillType":1402 },
+ data: { "BillNo": HBillno2, "BillType": 1402 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1507,7 +1543,7 @@
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
-
+
})
@@ -1632,7 +1668,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1875,4 +1911,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
index 9349b68..c965e15 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\256\242\346\210\267\346\213\234\350\256\277\350\256\260\345\275\225\345\215\225/Crm_ComplainVisitBillMainList.html"
@@ -418,7 +418,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_FastQuery(1);
+ get_FastQuery(1);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -546,11 +546,11 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -694,6 +694,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -991,7 +992,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
index 9c7c00c..0edd7ff 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillList.html"
@@ -496,7 +496,7 @@
//鍒濆鍖栭〉澶у皬
// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
- //get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -645,14 +645,12 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
+ table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1448,7 +1446,7 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
index 4130abf..c34a344 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
@@ -426,7 +426,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -524,13 +524,14 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -1556,7 +1557,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
index e7fb5bf..77789d2 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\351\200\200\346\254\276\345\215\225/YS_ReceiveBackBillList.html"
@@ -403,7 +403,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery();
+ get_FastQuery();
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -518,14 +518,14 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
+
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1106,7 +1106,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
index ec9ea39..0f15993 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillList.html"
@@ -448,7 +448,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery();
+ get_FastQuery();
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -666,15 +666,15 @@
option.cols = [col];
option.data = data1.data;
+ DisPlay_HideColumn();
ins = table.render(option);
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
} else {
@@ -1421,7 +1421,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
index 6c33582..7bbd1e5 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBillQuery.html"
@@ -427,7 +427,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -525,13 +525,11 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -1543,7 +1541,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
//form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
index 7f86c4a..7fac640 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBillList.html"
@@ -411,7 +411,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -526,14 +526,13 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1171,7 +1170,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
index 5009543..82587c0 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閫�璐ч�氱煡鍗曞垪琛�</title>
@@ -25,6 +26,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -41,45 +43,54 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2"
+ style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-colla-content">
@@ -87,19 +98,22 @@
<div class="layui-inline">
<label class="layui-form-label">瀹㈡埛</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HCusID" id="HCusID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCusID"
+ id="HCusID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HDeptID" id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">涓荤</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMangerID" id="HMangerID" style="width:190px;">
</div>
</div>
</div>
@@ -107,19 +121,25 @@
<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" 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -127,26 +147,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -154,26 +181,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -181,7 +215,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -221,7 +256,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -318,8 +353,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
- // DisPlay_HideColumn();
+ get_FastQuery()
+ // DisPlay_HideColumn();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -365,12 +400,12 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
+ , done: function (res, curr, count) {
soulTable.render(this);
}
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
@@ -434,7 +469,7 @@
url: GetWEBURL() + '/Xs_SeOutStockBackBill/list',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -457,7 +492,8 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -487,16 +523,16 @@
}
}
option.data = data1.data;
- table.render(option);
- layer.close(ajaxLoad);
- DisPlay_HideColumn();
- //鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ DisPlay_HideColumn();
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -504,6 +540,9 @@
}, error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }, complete: function () {
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
}
});
}
@@ -649,9 +688,9 @@
var HMangerID = $("#HMangerID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val(); var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var ColContent = $("#ColContent").val(); var ColName1 = $("#ColName1").val();//澶嶉�夋
var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val(); var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var ColContent1 = $("#ColContent1").val(); var ColName2 = $("#ColName2").val();//澶嶉�夋
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
@@ -1162,7 +1201,7 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ // get_FastQuery();
} else {
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
@@ -1175,7 +1214,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1345,7 +1384,7 @@
//#endregion
- //鍒楁槑鏄剧ず涓嬫媺妗�
+ //鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
@@ -1354,8 +1393,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');
}
@@ -1405,4 +1444,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\344\273\267\345\215\225/Xs_SeQuotationBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\344\273\267\345\215\225/Xs_SeQuotationBillMainList.html"
index 2b35114..21074b1 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\344\273\267\345\215\225/Xs_SeQuotationBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\344\273\267\345\215\225/Xs_SeQuotationBillMainList.html"
@@ -418,7 +418,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_FastQuery(1);
+ get_FastQuery(1);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -545,12 +545,11 @@
//鍒锋柊鎸夐挳鏄剧ず
Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -991,7 +990,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 5bf9c67..9ae473b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -597,11 +597,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_FastQuery();
- //get_Display(" and 1=0 ");
+ get_FastQuery();
//鍒濆鍖栭〉澶у皬
//DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
- // get_DisplayPage(" and 1=0 ");
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -2457,7 +2455,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
index a56ca30..5507a4e 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
@@ -453,7 +453,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -557,7 +557,7 @@
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1 ) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -1628,7 +1628,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
index b7c9048..c059d2d 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Xs_SeOrderChangeBillList.html"
@@ -410,7 +410,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -523,14 +523,14 @@
}
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
+
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
@@ -1169,7 +1169,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
index da25fa1..539e509 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
@@ -110,9 +110,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -145,9 +145,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -180,9 +180,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -437,7 +437,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery(1);
+ get_FastQuery(1);
//Organ();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -554,16 +554,15 @@
option.cols = [col];
option.data = data1.data;
- ins = table.render(option);
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ ins = table.render(option);
- layer.close(ajaxLoad);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -1149,15 +1148,16 @@
$('#HBeginDate').prop('disabled', false);
$('#HEndDate').prop('disabled', false);
}
-
+ get_FastQuery()
+ form.render("select");
+
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
+ form.render("select");
}
- get_FastQuery()
- form.render("select");
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
},
@@ -1265,12 +1265,11 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
}
else {
-
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
}
layer.closeAll("loading");
},
error: function (err) {
-
}
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
index c65f1d0..3afae1f 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBackBillList.html"
@@ -437,7 +437,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_FastQuery(table, option);
+ get_FastQuery(table, option);
//DisPlay_HideColumn();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -622,17 +622,17 @@
option.cols = [col];
option.data = result;
ins = table.render(option);
- layer.close(ajaxLoad);
-
+
DisPlay_HideColumn();
-
+
//鍒锋柊鎸夐挳鏄剧ず
// var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
// Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
option.data = [];
ins = table.render(option);
@@ -1284,7 +1284,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(table, option);
+ //get_FastQuery(table, option);
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index 9b52824..37fe9f7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -392,13 +392,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
-
- //DisPlay_HideColumn();
-
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
-
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -497,6 +491,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_ICStockBillMain/GetCStockBillList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -546,12 +541,16 @@
}
}
option.data = data1.data;
- table.render(option);
DisPlay_HideColumn();
- //鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ table.render(option);
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1043,7 +1042,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillList.html"
index b606458..48450c7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_ProductReceiveMaterialBillList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鐢熶骇棰嗘枡鍗曞垪琛�</title>
@@ -24,6 +25,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -40,48 +42,57 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<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">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMaterName" id="HMaterName" style="width:190px;">
</div>
</div>
</div>
@@ -89,19 +100,25 @@
<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" 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -109,26 +126,33 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <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 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -136,7 +160,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -144,19 +169,25 @@
<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 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;">
+ <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="<=">
+ <= </option>
+ <option value="<">
+ < </option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -164,7 +195,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -214,7 +246,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -245,7 +277,7 @@
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
//#endregion
-
+
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -486,7 +518,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
- DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ // DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
get_FastQuery(table, option);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -551,7 +583,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html?OperationType=3&linterid='+linterid+'&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: '../../棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
@@ -563,14 +595,14 @@
})
}
});
- //#endregion
+ //#endregion
//#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Kf_ProductReceiveMaterialBill/list',
- async:false,
+ async: false,
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -596,7 +628,8 @@
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
, event: '鍗曟嵁鍙�', templet: function (d) {
return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, style: 'cursor: pointer;' });
+ }, style: 'cursor: pointer;'
+ });
} else {
switch (data[i].Type) {
//int
@@ -655,16 +688,17 @@
option.data = result;
- ins = table.render(option);
- layer.close(ajaxLoad);
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+ ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+
+ if ($("#ColName option").length < 1) {
+ ColFilter()
}
+
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -974,7 +1008,7 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- if (data[0].鐘舵��=="鍒涘缓") {
+ if (data[0].鐘舵�� == "鍒涘缓") {
$.ajax({
type: "GET",
url: GetWEBURL() + "Kf_ProductReceiveMaterialBill/delete", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -1301,7 +1335,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
//get_FastQuery(table, option);
- //form.render("select");
+ form.render("select");
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1514,4 +1548,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 3c4398f..eb6ca84 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -613,7 +613,7 @@
//鍒濆鍖栭〉澶у皬
//DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鏌ヨ
- //get_FastQuery(table, option);
+ get_FastQuery(table, option);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -840,15 +840,15 @@
option.data = result;
ins = table.render(option);
- layer.close(ajaxLoad);
DisPlay_HideColumn();
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+
+ if ($("#ColName option").length < 1) {
ColFilter();
}
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -2045,7 +2045,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(table, option);
+ //get_FastQuery(table, option);
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
index 1216479..703f689 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
@@ -438,7 +438,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -542,7 +542,7 @@
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
}
layer.close(ajaxLoad);
@@ -1583,7 +1583,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 8c851e8..4eec288 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -151,9 +151,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -185,9 +185,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -219,9 +219,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -502,10 +502,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery()
-
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ get_FastQuery()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -909,13 +906,18 @@
}
DataList = data1.data;
option.data = data1.data;
+ DisPlay_HideColumn()
ins = table.render(option);
- layer.close(wait);
+
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
//鍒锋柊鎸夐挳鏄剧ず
- //var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- //var HBillType = "1204";
- //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1204";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(wait);
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -1665,7 +1667,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
index e5f36aa..265ad5f 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutRequestBillList.html"
@@ -387,12 +387,12 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_Display(sWhere);
+ get_FastQuery()
//闅愯棌鍕鹃�夊瓧娈�
// DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ // ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -534,12 +534,16 @@
DataList = data1.data;
option.data = data1.data;
table.render(option);
- layer.close(wait);
-
+ DisPlay_HideColumn()
+
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "1242";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(wait);
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -1018,7 +1022,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
index bcf2067..989ecb5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
@@ -254,7 +254,7 @@
, util = layui.util
, soulTable = layui.soulTable
//鏌ヨ鏉′欢
- var sWhere = "";
+ var sWhere = " and 1 = 1";
var option = [];
var HModName = "Kf_StockOutRequestBillList";
//#endregion
@@ -372,12 +372,12 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_Display(sWhere);
+ get_FastQuery()
//闅愯棌鍕鹃�夊瓧娈�
// DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ //ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -547,13 +547,18 @@
}
DataList = data1.data;
option.data = data1.data;
+ DisPlay_HideColumn()
table.render(option);
- layer.close(wait);
+
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1242";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1242";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(wait);
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -762,7 +767,7 @@
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- //sWhere = " where 1 = 1 ";
+ sWhere = " and 1 = 1 ";
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
@@ -775,7 +780,7 @@
$("#HMaterName").val("");
$("#HWHID").val("");
$("#HMakerMan").val("");
- sWhere = " where 1 = 1 ";
+ sWhere = " and 1 = 1 ";
get_Display(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index 631e762..76fcdf2 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -149,9 +149,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -184,9 +184,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -219,9 +219,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -542,9 +542,9 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_FastQuery();
+ get_FastQuery();
//浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
- ColFilter();
+ // ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -699,12 +699,17 @@
}
}
option.data = data1.data;
+ DisPlay_HideColumn()
ins = table.render(option);
- layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1203";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1203";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1269,7 +1274,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 241867b..3998d2d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -447,14 +447,10 @@
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery()
+ get_FastQuery()
//闅愯棌鍕鹃�夊瓧娈�
- // DisPlay_HideColumn();
-
- //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
-
+ // DisPlay_HideColumn()
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -576,6 +572,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBackBill/list',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -630,12 +627,17 @@
}
option.data = data1.data;
- table.render(option);
DisPlay_HideColumn();
+ table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1239";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1239";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
layer.close(ajaxLoad);
} else {
@@ -1255,7 +1257,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index f209a32..76617be 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -124,7 +124,7 @@
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <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>
@@ -381,12 +381,11 @@
//鍒濆鍖栭〉澶у皬
// DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- // get_FastQuery(table, option,2);
+ get_FastQuery(table, option,2);
//闅愯棌鍕鹃�夊瓧娈�
// DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -652,10 +651,15 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
ins = table.render(option);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
+ }
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1201";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1201";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -2092,7 +2096,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
index 76f7b26..0772e54 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>閲囪喘鍏ュ簱鍗曟煡璇�</title>
@@ -42,55 +43,65 @@
<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 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;">
+ <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;">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+ id="HBillNo" style="width:190px;">
</div>
</div>
-
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+ <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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+ id="HFilterScheme_Now"></div>
</div>
<div class="layui-colla-content">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">渚涘簲鍟�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HSupID" id="HSupID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSupID"
+ id="HSupID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HDeptID" id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">璐熻矗浜�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes"
+ name="HMangerID" id="HMangerID" style="width:190px;">
</div>
</div>
</div>
@@ -99,19 +110,25 @@
<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" 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;">
+ <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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -119,7 +136,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent" id="ColContent">
</div>
</div>
@@ -127,19 +145,25 @@
<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 name="ColName1" id="ColName1" class="ForFilteringSchemes"
+ lay-filter="ColName1" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -147,7 +171,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent1" id="ColContent1">
</div>
</div>
@@ -155,19 +180,25 @@
<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 name="ColName2" id="ColName2" class="ForFilteringSchemes"
+ lay-filter="ColName2" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
+ class="ForFilteringSchemes" 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="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -175,7 +206,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value=""
+ name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -227,7 +259,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -376,7 +408,7 @@
set_ClearQuery();
});
- table.on('tool(mainTable)' , function (obj) {
+ table.on('tool(mainTable)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.hmainid.toString();
@@ -403,7 +435,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ get_FastQuery(table, option, 2);
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -446,7 +478,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery(table, option,1)
+ get_FastQuery(table, option, 1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -464,7 +496,7 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, }
, { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true }
@@ -484,24 +516,24 @@
, { field: '鏃х墿鏂欑紪鐮�', title: '鏃х墿鏂欑紪鐮�', width: 130 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100, totalRow: true }
- , { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, totalRow: true }
+ , { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, totalRow: true }
/* 瀹夌憺鏂板瀛楁 begin */
- , { field: '鍙墦鍗版潯鐮佹暟閲�', title: '鍙墦鍗版潯鐮佹暟閲�', width: 120, totalRow: true}
+ , { field: '鍙墦鍗版潯鐮佹暟閲�', title: '鍙墦鍗版潯鐮佹暟閲�', width: 120, totalRow: true }
/* 瀹夌憺鏂板瀛楁 end */
- , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120, totalRow: true}
- , { field: '鏈叧鑱旀暟閲�', title: '鍙彂璐ф暟閲�', width: 120, totalRow: true}
+ , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120, totalRow: true }
+ , { field: '鏈叧鑱旀暟閲�', title: '鍙彂璐ф暟閲�', width: 120, totalRow: true }
/* 瀹夌憺鏂板瀛楁 begin */
- , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 120, totalRow: true}
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 120, totalRow: true}
- , { field: '鍏ュ簱鏁伴噺', title: '鍏ュ簱鏁伴噺', width: 120, totalRow: true}
- , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', width: 120, totalRow: true}
- , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', width: 120, totalRow: true}
+ , { field: '閫�鏂欐暟閲�', title: '閫�鏂欐暟閲�', width: 120, totalRow: true }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 120, totalRow: true }
+ , { field: '鍏ュ簱鏁伴噺', title: '鍏ュ簱鏁伴噺', width: 120, totalRow: true }
+ , { field: '鍓╀綑鍏ュ簱鏁伴噺', title: '鍓╀綑鍏ュ簱鏁伴噺', width: 120, totalRow: true }
+ , { field: '鍓╀綑鏀舵枡鏁伴噺', title: '鍓╀綑鏀舵枡鏁伴噺', width: 120, totalRow: true }
/* 瀹夌憺鏂板瀛楁 end */
, { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
//, { field: 'HUnitID', title: 'HUnitID', hide: true } 閲嶅
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 , hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120, hide: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
, { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 100, totalRow: true }
@@ -510,54 +542,54 @@
//, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
//, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
, { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 }
- , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100}
+ , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100 }
, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
, { field: '閲囪喘鏂瑰紡浠ｇ爜', title: '閲囪喘鏂瑰紡浠ｇ爜', width: 120, hide: true }
- , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100}
+ , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100 }
, { field: 'HSSID', title: 'HSSID', hide: true }
- , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 120}
- , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100}
+ , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 120 }
+ , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100 }
, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撶畻鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: 'HCurID', title: 'HCurID', hide: true }
, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', width: 100, hide: true }
- , { field: '甯佸埆', title: '甯佸埆', width: 100}
- , { field: '姹囩巼', title: '姹囩巼', width: 100}
+ , { field: '甯佸埆', title: '甯佸埆', width: 100 }
+ , { field: '姹囩巼', title: '姹囩巼', width: 100 }
, { field: 'HDeptID', title: 'HDeptID', hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100, hide: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100}
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100 }
, { field: 'HManagerID', title: 'HManagerID', hide: true }
, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 100, hide: true }
- , { field: '涓荤', title: '涓荤', width: 100}
+ , { field: '涓荤', title: '涓荤', width: 100 }
, { field: 'HEmpID', title: 'HEmpID', hide: true }
, { field: '鎽樿', title: '鎽樿', width: 100 }
- , { field: 'HWHID', title: '涓昏〃浠撳簱ID', width: 120, hide: true}
- , { field: '浠撳簱', title: '涓昏〃浠撳簱', width: 100, hide: true}
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
+ , { field: 'HWHID', title: '涓昏〃浠撳簱ID', width: 120, hide: true }
+ , { field: '浠撳簱', title: '涓昏〃浠撳簱', width: 100, hide: true }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100 }
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鍗曚环', title: '鍗曚环', width: 100}
+ , { field: '鍗曚环', title: '鍗曚环', width: 100 }
, { field: '閲戦', title: '閲戦', width: 100, totalRow: true }
- , { field: '绋庣巼', title: '绋庣巼', width: 100}
- , { field: '绋庨', title: '绋庨', width: 100}
- , { field: '鎶樻墸鐜�', title: '鎶樻墸鐜�', width: 100}
- , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100}
+ , { field: '绋庣巼', title: '绋庣巼', width: 100 }
+ , { field: '绋庨', title: '绋庨', width: 100 }
+ , { field: '鎶樻墸鐜�', title: '鎶樻墸鐜�', width: 100 }
+ , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100 }
, { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.浜よ揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100}
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100}
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100}
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100 }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 100}
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 100 }
, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100}
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100 }
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
- , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100}
+ , { field: '琛屽叧闂棩鏈�', title: '琛屽叧闂棩鏈�', width: 200, templet: "<div>{{d.琛屽叧闂汉 == ''?'':layui.util.toDateString(d.琛屽叧闂棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- ]]
+ ]]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -572,7 +604,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , cols:[[]]
+ , cols: [[]]
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
@@ -587,7 +619,7 @@
url: GetWEBURL() + '/Kf_POStockInBill/QueryList',
type: "GET",
async: false,
- data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -605,7 +637,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -625,7 +657,7 @@
return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
}, style: 'cursor: pointer;'
});
- }else {
+ } else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -639,14 +671,15 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ table.render(option);
+
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ // get_DefaultModule();//鍔犺浇鏂规
}
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -675,7 +708,7 @@
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+ var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
titleData = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -795,30 +828,30 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
/*if (data[0].鐘舵�� == "鍒涘缓") {*/
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Kf_POStockInBill/DeltetKf_POStockInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_POStockInBill/DeltetKf_POStockInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
-
- }, error: function () {
-
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
+
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
//} else {
// layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
@@ -1156,7 +1189,7 @@
//蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1566,7 +1599,7 @@
});
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
-
+
})
@@ -1691,7 +1724,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -1934,4 +1967,5 @@
//#endregion
</script>
</body>
+
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index eba2abd..5b6cf92 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -148,9 +148,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -183,9 +183,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -218,9 +218,9 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <=< /option>
+ <= </option>
<option value="<">
- << /option>
+ < </option>
<option value="<>">
<>
</option>
@@ -470,10 +470,10 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- // get_Display(sWhere);
+ get_FastQuery()
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
- ColFilter();
+ // ColFilter();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -568,13 +568,18 @@
}
option.data = data1.data;
+ DisPlay_HideColumn()
table.render(option);
- layer.close(index);
+ if($("#ColName option").length < 1){
+ ColFilter()
+ }
+
//鍒锋柊鎸夐挳鏄剧ず
- // var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- // var HBillType = "1210";
- // Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1210";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(index);
} else {
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1246,7 +1251,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
////鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ // get_FastQuery()
form.render("select");
}
}, error: function () {
--
Gitblit v1.9.1