From 6725bd2ae9e44e65bc0bf67fbc9e6fb6df423fe1 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 18 八月 2025 13:02:07 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/基础资料/Gy_PNLInfoTypeLevelEdit.html | 289 +++++++
WebTM/WebTM.csproj.user | 2
WebTM/views/基础资料/基础资料/Gy_PNLInfoTypeLevel.html | 1237 ++++++++++++++++++++++++++++++++
WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html | 140 ++-
WebTM/filterRowTemplate.html | 99 ++
WebTM/layuiadmin/modules/dropdown-disable.js | 40 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 299 ++-----
WebTM/layuiadmin/SetColumn.js | 120 +++
WebTM/WebTM.csproj | 4
9 files changed, 1,962 insertions(+), 268 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2155c32..7274df9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -85,6 +85,7 @@
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
+ <Content Include="filterRowTemplate.html" />
<Content Include="HtmlPage1.html" />
<Content Include="img\AI鑺墖.png" />
<Content Include="img\ic鑺墖.png" />
@@ -117,6 +118,7 @@
<Content Include="layuiadmin\layui\css\layui2.10.0.css" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui2.10.0.js" />
+ <Content Include="layuiadmin\modules\dropdown-disable.js" />
<Content Include="layuiadmin\modules\treeTable.js" />
<Content Include="layuiadmin\resize\ResizeLeftRight.css" />
<Content Include="layuiadmin\resize\ResizeLeftRight.js" />
@@ -546,6 +548,8 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClass_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCus.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceCusEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckClass.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClass.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainClassEdit.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 3c987b4..7ed83cb 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/filterRowTemplate.html b/WebTM/filterRowTemplate.html
new file mode 100644
index 0000000..f201119
--- /dev/null
+++ b/WebTM/filterRowTemplate.html
@@ -0,0 +1,99 @@
+锘�
+<div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;"></select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ <option value="涓虹┖">涓虹┖</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ <div class="layui-inline">
+ <select name="Logical_judgement" id="Logical_judgement" class="ForFilteringSchemes" lay-filter="Logical_judgement" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="涓�">骞朵笖</option>
+ <option value="鎴�">鎴栬��</option>
+ </select>
+ </div>
+</div>
+<div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName1">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ <option value="涓虹┖">涓虹┖</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ <div class="layui-inline">
+ <select name="Logical_judgement1" id="Logical_judgement1" class="ForFilteringSchemes" lay-filter="Logical_judgement1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="涓�">骞朵笖</option>
+ <option value="鎴�">鎴栬��</option>
+ </select>
+ </div>
+</div>
+<div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label" id="BT_ColName2">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ <option value="涓虹┖">涓虹┖</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+</div>
+
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 44b79eb..2ca97ef 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -734,3 +734,123 @@
}
return count;
}
+
+
+function buildFilterWhere(colName, comparator, colContent, Logical_judgement, sWhere) {
+ if (!colName || !comparator || comparator === "0") return "";
+ else if (sWhere == "") {
+ var com = "";
+ switch (comparator) {
+ case "7":
+ com = "like''%" + colContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + colContent + "''";
+ break;
+ case "9":
+ com = "like''" + colContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + colContent + "%''";
+ break;
+ default:
+ com = "" + comparator + "''" + colContent + "''";
+ break;
+ }
+ return " and " + "("+colName + " " + com ;
+ }
+ else if (sWhere != "")
+ {
+ var com = "";
+ switch (comparator) {
+ case "7":
+ com = "like''%" + colContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + colContent + "''";
+ break;
+ case "9":
+ com = "like''" + colContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + colContent + "%''";
+ break;
+ default:
+ com = "" + comparator + "''" + colContent + "''";
+ break;
+ }
+ return Logical_judgement === "鎴�" ? " or " + colName + " " + com + ")" : " and " + colName + " " + com + ")";
+ }
+ else {
+
+ var com = "";
+ switch (comparator) {
+ case "7":
+ com = "like''%" + colContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + colContent + "''";
+ break;
+ case "9":
+ com = "like''" + colContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + colContent + "%''";
+ break;
+ default:
+ com = "" + comparator + "''" + colContent + "''";
+ break;
+ }
+ return " and " + colName + " " + com;
+
+ }
+
+}
+function fixParenthesesMatching(swhere) {
+ const keywordEndPositions = [];
+ const keywordRegex = /\b(and|or)\b/gi;
+ let match;
+ while ((match = keywordRegex.exec(swhere)) !== null) {
+ keywordEndPositions.push(match.index + match[0].length);
+ }
+ keywordEndPositions.sort((a, b) => a - b);
+
+
+ let leftCount = 0;
+ const insertPositions = [];
+ const workingKeywordPositions = [...keywordEndPositions];
+
+ for (let i = 0; i < swhere.length; i++) {
+ if (swhere[i] === '(') {
+ leftCount++;
+ } else if (swhere[i] === ')') {
+ leftCount--;
+
+ if (leftCount < 0) {
+
+ let insertIndex = -1;
+ for (let j = workingKeywordPositions.length - 1; j >= 0; j--) {
+ if (workingKeywordPositions[j] < i) {
+ insertIndex = workingKeywordPositions[j];
+ workingKeywordPositions.splice(j, 1);
+ break;
+ }
+ }
+
+ insertPositions.push(insertIndex !== -1 ? insertIndex : 0);
+ leftCount = 0;
+ }
+ }
+ }
+
+ let result = swhere;
+ insertPositions
+ .sort((a, b) => b - a)
+ .forEach(pos => {
+ result = result.slice(0, pos) + '(' + result.slice(pos);
+ });
+
+ return result;
+}
+
+
diff --git a/WebTM/layuiadmin/modules/dropdown-disable.js b/WebTM/layuiadmin/modules/dropdown-disable.js
new file mode 100644
index 0000000..68cc434
--- /dev/null
+++ b/WebTM/layuiadmin/modules/dropdown-disable.js
@@ -0,0 +1,40 @@
+锘縧ayui.define(['jquery', 'form'], function (exports) {
+
+
+ var $ = layui.$;
+ var form = layui.form;
+
+ var DropdownDisable = {
+ init: function (options) {
+ var dropdownSelector = options.dropdown;
+ var inputSelector = options.input;
+ var filter = options.filter;
+ var disableValue = options.disableValue || "涓虹┖";
+
+ var $dropdown = $(dropdownSelector);
+ var $input = $(inputSelector);
+
+ if (!$dropdown.length || !$input.length || !filter) return;
+
+ form.on('select(' + filter + ')', function (data) {
+ DropdownDisable._updateInput($input, data.value === disableValue);
+ });
+
+ DropdownDisable._updateInput($input, $dropdown.val() === disableValue);
+ },
+
+ _updateInput: function ($input, disabled) {
+ if (disabled) {
+ $input.prop('disabled', true)
+ .addClass('layui-disabled')
+ .attr('placeholder', '宸茬鐢ㄨ緭鍏�');
+ } else {
+ $input.prop('disabled', false)
+ .removeClass('layui-disabled')
+ .attr('placeholder', '璇疯緭鍏ュ唴瀹�');
+ }
+ }
+ };
+
+ exports('dropdownDisable', DropdownDisable);
+});
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
index d91c6af..be6b0db 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
@@ -59,9 +59,18 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">绔欏彴</label>
+ <label class="layui-form-label">绔欏埆</label>
<div class="layui-input-block" style="width:180px;">
- <select id="Station" name="Station"></select>
+ <select id="Station" name="Station">
+ <option value="0" selected="selected"></option>
+ <option value="AOI1">AOI1</option>
+ <option value="AOI2">AOI2</option>
+ <option value="AOI3">AOI3</option>
+ <option value="AOI4">AOI4</option>
+ <option value="AVI">AVI</option>
+ <option value="鐢垫祴">鐢垫祴</option>
+ </select>
+
</div>
</div>
<div class="layui-inline">
@@ -226,6 +235,7 @@
var option_LotNoList = [];
var HModName = "Sc_BarCodeReport";
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var ins1; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -266,7 +276,7 @@
//鍒濆鍖栨棩鏈�
setSelect_HInitTimeCycle();
//鍒濆鍖栨椂闂�
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ var HInitTimeCycle = $("#HInitTimeCycle").val()*1;
if (HInitTimeCycle != -1) {
$('#HBeginDate').prop('disabled', true);
$('#HEndDate').prop('disabled', true);
@@ -278,11 +288,11 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栦笅鎷夋
initSelects();
- set_InitGrid();
+
//鍔犺浇鏁版嵁鍒扮綉鏍�
-
+ set_InitGrid();
get_FastQuery();
- // set_Graphics();
+ set_Graphics();
}
//鍒濆鍖栬〃鏍�
@@ -332,32 +342,32 @@
$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
form.render('select'); //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
- $("#HInitTimeCycle").val("29"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+ $("#HInitTimeCycle").val("1"); //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29 锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
}
//#endregion
//#region
// 鍒濆鍖栦笅鎷�
function initSelects() {
- // 绔欏彴銆佹枡鍙蜂笅鎷夊彲閫氳繃AJAX鑾峰彇
- var StationList = '<option value="0" style="color:red;" selected></option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Gy_BarCodeReportController/Get_Stations",
- async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- StationList += '<option style="color:blue;" value="' + data[i].妫�楠屽伐搴� + '" >' + data[i].妫�楠屽伐搴� + '</option>';
- }
- $("#Station").append(StationList);
- form.render('select');
+ //// 绔欏彴銆佹枡鍙蜂笅鎷夊彲閫氳繃AJAX鑾峰彇
+ //var StationList = '<option value="0" style="color:red;" selected></option>';
+ //$.ajax({
+ // type: "get",
+ // url: GetWEBURL() + "/Gy_BarCodeReportController/Get_Stations",
+ // async: false,
+ // data: { "HOrgID": sessionStorage["OrganizationID"] },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // var data = result.data;
+ // for (var i = 0; i < data.length; i++) {
+ // StationList += '<option style="color:blue;" value="' + data[i].妫�楠屽伐搴� + '" >' + data[i].妫�楠屽伐搴� + '</option>';
+ // }
+ // $("#Station").append(StationList);
+ // form.render('select');
- }
- layer.closeAll("loading");
- }
- })
+ // }
+ // layer.closeAll("loading");
+ // }
+ //})
var MaterialNoList = '<option value="0" style="color:red;" selected></option>';
$.ajax({
type: "get",
@@ -382,7 +392,7 @@
function get_BadReasonCount(sWhere) {
$.ajax({
- url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_proc',
+ url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_pie',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -391,11 +401,11 @@
if (data1.count == 1) {
var data = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.data[1].list) {
- data.push({ "name": data1.data[1].list[key].ColmCols, "Type": data1.data[1].list[key].ColmType });
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
/* option_BadReason.cols = [col];*/
- option_BadReason.data = data1.data[1];
+ option_BadReason.data = data1.data;
/*ins = table.render(option_BadReason);*/
@@ -477,10 +487,8 @@
}
}
}
-
option.cols = [col];
option.data = data_1;
-
ins = table.render(option);
layer.close(wait);
} else {
@@ -493,12 +501,14 @@
}
});
}
+
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#Station").val("0");
$("#MaterialNo").val("0");
$("#LotNo").val("");
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HInitTimeCycle").val("-1");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 ), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
form.render('select');
get_FastQuery();
@@ -509,12 +519,13 @@
var HBeginDate = $("#HBeginDate").val();//璧峰鏃ユ湡
var HEndDate = $("#HEndDate").val();//鎴鏃ユ湡
var Station = $("#Station").val();//绔欏彴鍙�
+ if (Station == 0) Station = "";
var MaterialNo = $("#MaterialNo").val();//鏂欏彿
+ if (MaterialNo == 0) MaterialNo = "";
var LotNo = $("#LotNo").val();//鎵规鍙�
sWhere_1 = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
- , Station: Station
, MaterialNo: MaterialNo
, LotNo: LotNo
}
@@ -522,10 +533,11 @@
HBeginDate: HBeginDate
, HEndDate: HEndDate
, MaterialNo: MaterialNo
+ , Station: Station
, LotNo: LotNo
}
- get_Display(JSON.stringify(sWhere_1));
- get_BadReasonCount(JSON.stringify(sWhere_1));
+ get_Display(JSON.stringify(sWhere_2));
+ get_BadReasonCount(JSON.stringify(sWhere_2));
get_LotNoCount(JSON.stringify(sWhere_2));
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -665,8 +677,8 @@
name: reason
});
});
-
-
+
+
//$("#MaterialNo").val()
option_BT = {
title: {
@@ -698,7 +710,7 @@
option_BT && myChart.setOption(option_BT);
//#endregion
-
+
//鏌辩姸鍥剧粦瀹氭暟鎹�
//#region 銆愭煴鐘跺浘銆�
@@ -799,9 +811,9 @@
//姣忎釜鎵规鐨凱CS鎬绘暟count_option_LotNoList
var count_option_LotNoList = 0;
var AllCount = 0;
- var BadReasonCount=0 ;
-
-
+ var BadReasonCount = 0;
+
+
var ZZTColor2 = ['#00FFFF', '#FC2C83', '#FCED2C', '#93FC2C', '#FC2CF0', '#FC892C', '#2C81FC', '#2CC9FC', '#2CFCA7', '#DED3F2', '#F2D8D3', '#F2D3E0', '#D8E052', '#7EE052', '#52E0D8', '#5F52E0', '#E06F52', '#52E09B', '#E052DE', '#E05F52', '#52B2E0', '#E0C452', '#52CEE0', '#648690', '#E5D1D6', '#D8E5D1', '#E5D1E5', '#D8E5D1', '#7C6262', '#76627C', '#81A583', '#81A595'];
//缁熻涓嶅悓鎵规鍙蜂笅鐨勬�绘暟鐩�
for (let i = 0; i < option_LotNoList.data.length; i++) {
@@ -809,29 +821,29 @@
AllCount++;
count_option_LotNoList += option_LotNoList.data[i].鎬昏;
}
- for (let i = 0; i < option_BadReason.data.length; i++) {
- BadReasonCount += option_BadReason.data[i].涓嶈壇鍘熷洜鏁伴噺;
- }
-
+ for (let i = 0; i < option_BadReason.data.length; i++) {
+ BadReasonCount += option_BadReason.data[i].涓嶈壇鍘熷洜鏁伴噺;
+ }
+
for (let i = 0; i < option_LotNoList.data.length; i++) {
HXTitle.push(option_LotNoList.data[i].HBatchNo);
-
- HSourceIssueCount.push(BadReasonCount);
- HSourceIssueCount1.push(count_option_LotNoList);
- HSourceIssueCount2.push(((BadReasonCount) / (AllCount * count_option_LotNoList))*100+'%');
- ZZTColor.push({
- x: 1,
- y: 0,
- x2: 0,
- y2: 0,
- type: "linear",
- colorStops: [
- { offset: 0, color: "red" },
- { offset: 1, color: "blue" },
- { offset: 2, color: "green" }
- ]
- });
-
+
+ HSourceIssueCount.push(BadReasonCount);
+ HSourceIssueCount1.push(count_option_LotNoList);
+ HSourceIssueCount2.push(((BadReasonCount) / (AllCount * count_option_LotNoList)) * 100 + '%');
+ ZZTColor.push({
+ x: 1,
+ y: 0,
+ x2: 0,
+ y2: 0,
+ type: "linear",
+ colorStops: [
+ { offset: 0, color: "red" },
+ { offset: 1, color: "blue" },
+ { offset: 2, color: "green" }
+ ]
+ });
+
}
@@ -853,7 +865,7 @@
}
},
legend: {
- data: ['涓嶈壇鏁扮洰', '鎬绘暟','涓嶈壇鐜�']
+ data: ['涓嶈壇鏁扮洰', '鎬绘暟', '涓嶈壇鐜�']
},
toolbox: {
show: true,
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevel.html"
new file mode 100644
index 0000000..54bd8b1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevel.html"
@@ -0,0 +1,1237 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>PNL甯冨眬淇℃伅灞傚埆鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/treeTable.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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="HNumber" id="HNumber">
+ </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">
+ </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="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <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>
+ <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" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <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;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-add-1"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+
+ var TagId = "";
+ var TagParentId = "";
+ var Level = "1";
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_PNLInfoTypeSub";
+ var HBillType = "Gy_PNLInfoTypeSub";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID"];
+ //#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "鐐规椤圭洰鍒楄〃缁存姢";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_ClearBill();
+ //#endregion
+
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ case 'btn_Copy':
+ set_copy();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': btn_Export();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': set_ClearQuery();
+ break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //鍒楄缃�
+ case 'btn_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '灞傜骇浠ｇ爜') {
+ var hID = data.HInterID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_PNLInfoTypeLevelEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ var index = parent.layer.getFrameIndex(window.name);
+ var data = obj.data;
+ //杩斿洖鏂规硶
+ parent.GetDotCheckListValue(data);
+ parent.layer.close(index);
+ })
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+
+ function set_ClearBill() {
+ set_StockOrg();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鏌ヨ
+ get_Display(sWhere);
+ //鏌ヨ璁惧鍒嗙被
+ get_Display_Tree();
+
+ get_DefaultModule();
+ }
+
+ //#region鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_PNLInfoTypeLevelController/GetPNLInfoTypeLevel',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ 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) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ 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: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+ table.render(option);
+
+ layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+
+ //鎸夐挳鏁版嵁鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HUSEORGID = $("#HUSEORGID").val(); //缁勭粐
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HNumber) {
+ sWhere += " and 灞傜骇浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HUSEORGID) {
+ sWhere += " and 浣跨敤缁勭粐鍚嶇О = '" + HUSEORGID + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function btn_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#HUSEORGID").val(sessionStorage["Organization"]);
+ form.render('select');
+
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 宸ュ叿鏍忎簨浠�
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐐规椤圭洰瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍩虹璧勬枡/Gy_DotCheck_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
+
+ //鏂板
+ function set_AddNew() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板灞傜骇椤圭洰',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: ['../鍩虹璧勬枡/Gy_PNLInfoTypeLevelEdit.html?OperationType=1&linterid=&HSouceBillType='],
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+
+ }
+
+ //淇敼鎸夐挳
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].灞傜骇浠ｇ爜;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫灞傜骇椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_PNLInfoTypeLevelEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , yes: function (index, layero) {
+ $.ajax({
+ url: GetWEBURL() + '/Gy_PNLInfoTypeLevelController/DeleteType',
+ type: "GET",
+ data: { "HInterID": data[0].灞傜骇浠ｇ爜 },
+ 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();
+ //閲嶈浇tree
+ //tree.reload('treeDepartment', {});
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ };
+
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").click();
+ }
+
+ //棰勮
+ //function get_ViewReport() {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
+ // if (checkStatus.data.length === 1) {
+ // var InterID = data[0].hmainid.toString();
+ // window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDotCheck&OpenTmp=鐐规椤圭洰");
+
+ // }
+ // else {
+ // layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ // }
+ //}
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].灞傜骇浠ｇ爜.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PNLInfoTypeLevelController/AuditGy_DotCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].灞傜骇浠ｇ爜.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_PNLInfoTypeLevelController/StopGy_DotCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 鑾峰彇缁勭粐
+ function set_StockOrg() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ Organization += '<option style="color:blue;" value="">鍏ㄩ儴</option>';
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["Organization"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //#endregion
+
+ //澶嶅埗
+ function set_copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规椤圭洰'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=2&hID=' + HInterID
+ , resize: false
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_PNLInfoTypeLevelController/TreeGetList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ var sql = "";
+ if (data.id == "0") {
+ sql = "";
+ }
+ else {
+ sql = " and 灞傜骇浠ｇ爜='" + data.id + "' ";
+ }
+ get_Display(sql);
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
+ //#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);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var addSWhere = "";
+ if (typeof (openType) != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� != ''";
+ }
+ return addSWhere;
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ 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";
+ //鎵ц鏌ヨ鏂规硶
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ 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({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ 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>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ 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>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+ //浠ヤ笂鏄痩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);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevelEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevelEdit.html"
new file mode 100644
index 0000000..9d82567
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PNLInfoTypeLevelEdit.html"
@@ -0,0 +1,289 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鏂板/缂栬緫灞傜骇椤圭洰</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/treeTable.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">灞傜骇浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+ <!--<input id="HInterID" name="HInterID" type="hidden" />-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">灞傜骇</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEntryID" lay-verify="HEntryID" id="HEntryID">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">姝ｅ弽闈�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPageIndex" lay-verify="HPageIndex" id="HPageIndex">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">棰滆壊</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HColorStr" lay-verify="HColorStr" id="HColorStr">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">楠岃瘉鐮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLayerNo" lay-verify="HLayerNo" id="HLayerNo">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //#endregion
+ //甯歌鐢ㄦ硶
+
+
+
+ if (OperationType == 1) { //鏂板
+ //$("#HMakeEmp").val(sessionStorage["HUserName"]);
+
+ } else if (OperationType == 2) {
+ RoadBillMain(linterid);
+ //$("#HMakeEmp").val(sessionStorage["HUserName"]);
+ //$("#HModifyEmp").val("");
+ //$("#HStopEmp").val("");
+ //$("#HCheckEmp").val("");
+ //$("#HMakeTime").val("");
+ //$("#HModifyTime").val("");
+ //$("#HStopTime").val("");
+ //$("#HCheckTime").val("");
+ $("#HNumber").val("");
+ $("#HItemID").val(0);
+ } else if (OperationType == 3) {
+ $("#HNumber").prop('disabled', true)
+ .addClass('layui-disabled')
+ .attr('placeholder', '宸茬鐢ㄨ緭鍏�');
+ $("#HEntryID").prop('disabled', true)
+ .addClass('layui-disabled')
+ .attr('placeholder', '宸茬鐢ㄨ緭鍏�');
+ layui.form.render();
+ RoadBillMain(linterid);
+ }
+
+ //#region 宸ュ叿鎸夐挳
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ })
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ //var user = sessionStorage["HUserName"];
+ data.field.HInterID = $("#HNumber").val();
+ data.field.HEntryID = $("#HEntryID").val();
+ if ($("#HEntryID").val() == "")
+ data.field.HEntryID = "";
+ data.field.HLayerNo = $("#HLayerNo").val();
+
+ var oMain = JSON.stringify(data.field)
+ var sMainSub = oMain;
+
+ if (OperationType == 3) {
+
+ //淇敼
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_PNLInfoTypeLevelController/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ }
+ else {
+ //鏂板
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_PNLInfoTypeLevelController/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + oMain);
+ }
+ });
+ }
+ });
+
+ //#endregion
+
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function RoadBillMain(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_PNLInfoTypeLevelController/EditType",
+ type: "GET",
+ async: false,
+ data: {
+ "HInterID": linterid
+ },
+ success: function (d) {
+
+ ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HNumber").val(d.data[0].HInterID);
+ $("#HEntryID").val(d.data[0].HEntryID);
+ $("#HPageIndex").val(d.data[0].HPageIndex);
+ $("#HColorStr").val(d.data[0].HColorStr);
+ $("#HLayerNo").val(d.data[0].HLayerNo);
+
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+ }
+
+ });
+ }
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 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\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 56077f8..e10aa56 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -141,87 +141,8 @@
</div>
</div>
</div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label" id="BT_ColName">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label" id="BT_ColName1">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label" id="BT_ColName2">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
+ <div id="filter-row"> <!--杩囨护妗唄tml-->
+ </div>
</div>
</div>
</div>
@@ -326,7 +247,8 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableFilter'], function () {
+ dropdownDisable: 'dropdown-disable'//涓嬫媺妗嗙鐢ㄨ仈鍔ㄦā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -361,7 +283,7 @@
var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
- var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "娴佽浆鍗＄粍缁�", "HCenterID", "HbillSubType", "HPRDORGID", "鐢熶骇璁㈠崟涓氬姟绫诲瀷", "宸ュ簭宸ヤ环", "宸ヤ环","閲戦","璁惧娓呭崟","鍗曟嵁绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "娴佽浆鍗＄粍缁�", "HCenterID", "HbillSubType", "HPRDORGID", "鐢熶骇璁㈠崟涓氬姟绫诲瀷", "宸ュ簭宸ヤ环", "宸ヤ环", "閲戦", "璁惧娓呭崟", "鍗曟嵁绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -389,7 +311,28 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
-
+ //涓嬫媺妗嗙鐢ㄨ仈鍔�
+ layui.use(['form', 'dropdownDisable'], function () {
+ var dropdownDisable = layui.dropdownDisable;
+ dropdownDisable.init({
+ dropdown: '#Comparator',
+ input: '#ColContent',
+ filter: 'Comparator', // lay-filter 鍚嶇О
+ disableValue: '涓虹┖'
+ });
+ dropdownDisable.init({
+ dropdown: '#Comparator1',
+ input: '#ColContent1',
+ filter: 'Comparator1', // lay-filter 鍚嶇О
+ disableValue: '涓虹┖'
+ });
+ dropdownDisable.init({
+ dropdown: '#Comparator2',
+ input: '#ColContent2',
+ filter: 'Comparator2', // lay-filter 鍚嶇О
+ disableValue: '涓虹┖'
+ });
+ });
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -430,7 +373,7 @@
get_FastQuery();
}
//initFunction(1, HModName, sessionStorage["HTranSlate"]);
- });
+ });
//#region 鍥炶溅鏌ヨ
@@ -522,9 +465,9 @@
check_row(obj);
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var HMainID = datas.hmainid;
-
- SelectTechParam(HMainID,"TechParam");//宸ヨ壓鍙傛暟
- SelectTechParam(HMainID,"Note"); //鎿嶄綔鏃ュ織
+
+ SelectTechParam(HMainID, "TechParam");//宸ヨ壓鍙傛暟
+ SelectTechParam(HMainID, "Note"); //鎿嶄綔鏃ュ織
SelectTechParam(HMainID, "SN"); //SN搴忓垪鐮�
SelectTechParam(HMainID, "Emp"); //鎿嶄綔鍛樻竻鍗�
SelectTechParam(HMainID, "Sup"); //渚涘簲鍟嗘竻鍗�
@@ -583,7 +526,7 @@
switch (obj.event) {
//鍒犻櫎
case 'btn-Delete5': btn_Delete5();
- break;
+ break;
};
});
@@ -617,16 +560,16 @@
});
//鏌ヨ宸ヨ壓鍙傛暟
- function SelectTechParam(HMainID,TableName) {
+ function SelectTechParam(HMainID, TableName) {
var wait = layer.load();
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_SubDisplay',
type: "GET",
- data: { "sWhere": HMainID, "TableName": TableName},
+ data: { "sWhere": HMainID, "TableName": TableName },
async: false,
success: function (data1) {
if (data1.count == 1) {
- var totalArray = ["鐢熶骇鏁伴噺", "宸ヤ环", "閲戦", "浠诲姟鏁伴噺", "鏁伴噺", "鍑虹珯鏁伴噺", "鎶ュ簾鏁伴噺", "涓嶈壇鏁伴噺", "宸ユ椂", "娴佽浆鍗℃暟閲�","浠诲姟鍗曟暟閲�"];
+ var totalArray = ["鐢熶骇鏁伴噺", "宸ヤ环", "閲戦", "浠诲姟鏁伴噺", "鏁伴噺", "鍑虹珯鏁伴噺", "鎶ュ簾鏁伴噺", "涓嶈壇鏁伴噺", "宸ユ椂", "娴佽浆鍗℃暟閲�", "浠诲姟鍗曟暟閲�"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -680,14 +623,14 @@
case "Note":
//鍔ㄦ�佹樉绀哄垪鍚�
- option2 = {
+ option2 = {
elem: '#mainTable2'
, toolbar: '#toolbarDemo2'
, cols: [col]
, data: data1.data
, height: 550
- , page: true
- , totalRow: true
+ , page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -699,14 +642,14 @@
case "SN":
//鍔ㄦ�佹樉绀哄垪鍚�
- option3 = {
+ option3 = {
elem: '#mainTable3'
, toolbar: '#toolbarDemo3'
, cols: [col]
, data: data1.data
, height: 550
- , page: true
- , totalRow: true
+ , page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -719,14 +662,14 @@
case "Emp":
//鍔ㄦ�佹樉绀哄垪鍚�
- option4 = {
+ option4 = {
elem: '#mainTable4'
, toolbar: '#toolbarDemo4'
, cols: [col]
, data: data1.data
, height: 550
- , page: true
- , totalRow: true
+ , page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -785,9 +728,13 @@
}
});
}
-
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ $.get("../../../filterRowTemplate.html", function (data) {
+ $("#filter-row").html(data);
+ ColFilter(); // 閲嶆柊鐢熸垚涓嬫媺閫夐」
+ layui.form.render(); // 娓叉煋琛ㄥ崟鎺т欢
+ });
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -841,9 +788,9 @@
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', totalRow: true}
- , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', totalRow: true}
- , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', totalRow: true}
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', totalRow: true }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', totalRow: true }
, { field: '鍖呰鏍囪瘑浠ｇ爜', title: '鍖呰鏍囪瘑浠ｇ爜', width: 115 }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 115 }
, {
@@ -876,7 +823,7 @@
limit: 50,
limits: [50, 500, 5000, 50000],
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
- jump: function (obj, first) {
+ jump: function (obj, first) {
//棣栨涓嶆墽琛�
if (!first) {
//do something
@@ -889,7 +836,7 @@
}
laypage.render(optionPage);
}
-
+
//鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
@@ -900,7 +847,7 @@
$('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
$('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
//$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
-
+
}
@@ -943,10 +890,10 @@
//涓嬫帹PPM鏁版嵁褰曞叆鍗�
case 'btn-SupReport': set_SupReport();
break;
-
+
//閫�鍑�
case 'btn-Exit': get_Exit();
- break;
+ break;
//瀵煎嚭excel
case 'get_export':
get_Export();
@@ -967,10 +914,10 @@
//缈昏瘧
case 'set_FY': initFunction(1, HModName, sessionStorage["HTranSlate"]);
break;
-
+
};
});
-
+
//鏉＄爜鍒犻櫎
function btn_Delete3() {
@@ -1013,13 +960,13 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
- var HInterID = data[0].HInterID;
+ var HInterID = data[0].HInterID;
var ajaxLoad = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/PPMSupDelete',
type: "GET",
- data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
SelectTechParam(HInterID, "Sup");
@@ -1253,10 +1200,10 @@
layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
}
})
- //#endregion
- }
+ //#endregion
+ }
- //闅愯棌鍒楄缃� 宸ヨ壓鍙傛暟
+ //闅愯棌鍒楄缃� 宸ヨ壓鍙傛暟
function get_HideColumn_TechParam() {
var colName = "";
for (var i = 1; i < option1.cols[0].length; i++) {
@@ -1371,10 +1318,10 @@
})
}
- //闅愯棌鍒楄缃� 鎿嶄綔鏃ュ織
+ //闅愯棌鍒楄缃� 鎿嶄綔鏃ュ織
function get_HideColumn_Note() {
var colName = "";
- for (var i = 1; i < option2.cols[0].length ; i++) {
+ for (var i = 1; i < option2.cols[0].length; i++) {
colName += option2.cols[0][i]["title"] + ",";
}
@@ -1486,7 +1433,7 @@
})
}
- //闅愯棌鍒楄缃� SN搴忓垪鐮�
+ //闅愯棌鍒楄缃� SN搴忓垪鐮�
function get_HideColumn_SN() {
var colName = "";
for (var i = 1; i < option3.cols[0].length; i++) {
@@ -1730,7 +1677,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType":"3791"},
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (result) {
if (result.count == 1) {
layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1764,7 +1711,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791"},
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (result) {
if (result.count == 1) {
layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1796,7 +1743,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/CloseCj_StationOutBill',
type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3791"},
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
success: function (result) {
if (result.count == 1) {
layer.msg(get_MessageError(result.Message, sessionStorage["HTranSlate"]), { icon: 1 });
@@ -1823,7 +1770,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid.toString();
+ var linterid = data[0].hmainid.toString();
//var HICMOEntryID = data[0].HICMOEntryID.toString();
var OperationType = 2;
layer.open({
@@ -1888,17 +1835,17 @@
for (var i = 0; i < checkStatus.data.length; i++) {
if (data[i].HGroupID != HGroupID_JY || data[i].HDeptID || HDeptID_JY) {
- HERR += "绗�" + (i+1) + "琛岋紝鐢熶骇鐝粍鎴栬�呯敓浜ц溅闂达紝涓庡叾浣欒涓嶄竴鑷达紝涓嶅厑璁稿悎骞朵笅鎺紒"
+ HERR += "绗�" + (i + 1) + "琛岋紝鐢熶骇鐝粍鎴栬�呯敓浜ц溅闂达紝涓庡叾浣欒涓嶄竴鑷达紝涓嶅厑璁稿悎骞朵笅鎺紒"
}
linterid.push(data[i].hmainid.toString());
}
if (HERR != "") {
- layer.msg(HERR,{ time: 3000, })
+ layer.msg(HERR, { time: 3000, })
return;
}
-
+
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1924,7 +1871,7 @@
function set_SupReport() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length ==1) {
+ if (checkStatus.data.length == 1) {
var linterid = data[0].hmainid.toString();
layer.open({
type: 2
@@ -1937,7 +1884,7 @@
, resize: false
, cancel: function () {
btnIs();
- }
+ }
})
} else {
layer.msg(get_MessageError('[0000-1-015]璇烽�夋嫨鏁版嵁涓嬫帹锛�', sessionStorage["HTranSlate"]));
@@ -2054,23 +2001,26 @@
function set_ClearQuery() {
$("#HOrgID").val(sessionStorage["OrganizationID"])
$("#HWorkBillNo").val("");
- $("#HBillNo").val("");
- $("#HProcExchBillNo").val("");
+ $("#HBillNo").val("");
+ $("#HProcExchBillNo").val("");
$("#HNumber").val("");
$("#HName").val("");
$("#HEmpNumber").val("");
$("#HEmpName").val("");
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent1").val("");
+ $("#Logical_judgement").val("0");
$("#ColName1").val("0");
$("#Comparator1").val("0"); $("#ColContent2").val("");
+ $("#Logical_judgement1").val("0");
$("#ColName2").val("0");
$("#Comparator2").val("0");
-
+ $("#Logical_judgement2").val("0");
+
form.render('select');
sWhere = "";
}
@@ -2095,83 +2045,26 @@
var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val();
+ var Logical_judgement = $("#Logical_judgement").val();
var ColContent = $("#ColContent").val();
var ColName1 = $("#ColName1").val();//澶嶉�夋
var Comparator1 = $("#Comparator1").val();
var ColContent1 = $("#ColContent1").val();
+ var Logical_judgement1 = $("#Logical_judgement1").val();
var ColName2 = $("#ColName2").val();//澶嶉�夋
var Comparator2 = $("#Comparator2").val()
var ColContent2 = $("#ColContent2").val();
+ var Logical_judgement2 = $("#Logical_judgement2").val();
var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
var HName = $("#HName").val(); //褰撳墠宸ュ簭
var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like''%" + ColContent + "%''";
- break;
- case "8":
- com = "like''%" + ColContent + "''";
- break;
- case "9":
- com = "like''" + ColContent + "%''";
- break;
- case "10":
- com = "not like''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + "''" + ColContent + "''";
- break;
- }
- sWhere += " and " + ColName+ " "+ com;
- }
-
- if (ColName1 != 0 && Comparator1 != 0) {
- var com = "";
- switch (Comparator1) {
- case "7":
- com = "like''%" + ColContent1 + "%''";
- break;
- case "8":
- com = "like''%" + ColContent1 + "''";
- break;
- case "9":
- com = "like''" + ColContent1 + "%''";
- break;
- case "10":
- com = "not like''%" + ColContent1 + "%''";
- break;
- default:
- com = "" + Comparator1 + "''" + ColContent1 + "''";
- break;
- }
- sWhere += " and " + ColName1 + " " + com;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
+ //杩囨护妗嗚繃婊�
+ sWhere += buildFilterWhere(ColName, Comparator, ColContent, Logical_judgement, sWhere);
+ sWhere += buildFilterWhere(ColName1, Comparator1, ColContent1, Logical_judgement, sWhere);
+ sWhere += buildFilterWhere(ColName2, Comparator2, ColContent2, Logical_judgement1, sWhere);
+ //鎷彿鍖归厤
+ sWhere=fixParenthesesMatching(sWhere);
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= ''" + HBeginDate + "''";
}
@@ -2222,7 +2115,7 @@
default:
}
}
- sWhere += " and HBillSubType<>''SUB''";
+ sWhere += " and HBillSubType<>''SUB''";
sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
sWhere += getDeptIDByUser();//鐢ㄦ埛鍏宠仈閮ㄩ棬杩囨护
@@ -2235,7 +2128,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- var ajaxLoad = layer.load();
+ var ajaxLoad = layer.load();
var wait = layer.load();
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
@@ -2284,7 +2177,7 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
- }
+ }
}
}
}
@@ -2330,7 +2223,7 @@
});
layer.close(wait);
}
-
+
//#region 鏌ヨ-鍒嗛〉
function get_DisplayPage(sWhere) {
var wait = layer.load();//閬僵
--
Gitblit v1.9.1