From 80efcc1e810773d7efeea408b1b26c9b5da65e8f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 22 七月 2024 16:30:52 +0800
Subject: [PATCH] 新的隐藏列设置，报表页面优化
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 120 ++++---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 474 +++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_OutList.html | 106 +++---
WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html | 2
WebTM/views/领料发货/领料出库/Kf_MateOutRequestBillList.html | 99 +++---
WebTM/WebTM.csproj | 1
WebTM/views/仓存管理/条码报表/Kf_StockInOutSumQueryReport.html | 2
7 files changed, 648 insertions(+), 156 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d64522e..40f8c06 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -369,6 +369,7 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheck_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\Sc_MouldDotCheckTaskReport.html" />
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
index aab568c..ad00c64 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
@@ -435,7 +435,7 @@
option.totalRow = true;
table.render(option);
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ /* layer.alert(data1.code + data1.Message, { icon: 5 });*/
}
},
error: function () {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
index 9cdca1a..cc151f4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
@@ -471,7 +471,7 @@
option.totalRow = true;
table.render(option);
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
}
},
error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
new file mode 100644
index 0000000..20571b1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -0,0 +1,474 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>闅愯棌鍒楄缃�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="CheckAll" id="CheckAll">鍏ㄩ��</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="ClearBill" id="ClearBill">鍏ㄦ竻</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn_up" id="btn_up">涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn_under" id="btn_under">涓嬩竴琛�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Del" id="Del">鍒犻櫎</button>
+ </div>
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HFixCols" lay-verify="HFixCols" id="HFixCols">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀛椾綋澶у皬</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HFontSize" lay-verify="HFontSize" id="HFontSize">
+ </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" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
+ </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" lay-verify="HPageSize" name="HPageSize" id="HPageSize">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐐瑰嚮鎺掑簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HSortFlag" lay-verify="HSortFlag" id="HSortFlag">
+ <option value=""></option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫変腑琛屽悎璁�</label>
+ <div class="layui-input-block" style="margin-left: 125px;width: 184px;">
+ <select name="HSelTotal" lay-verify="HSelTotal" id="HSelTotal">
+ <option value=""></option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�">鍚�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<!--琛屼笅鎷夐�夋嫨(瀵归綈鏂瑰紡)-->
+<script type="text/html" id="Alignment">
+ <select name="Alignment" lay-filter="Alignment" id="Alignment{{d.LAY_TABLE_INDEX+1}}">
+ <option value="L">宸﹀榻�</option>
+ <option value="M">灞呬腑</option>
+ <option value="R">鍙冲榻�</option>
+ </select>
+</script>
+<!--澶嶉�夋 鏄惁闅愯棌-->
+<script type="text/html" id="IsHide">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="IsHide" lay-filter="IsHide" id="IsHide{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+</script>
+<script>
+ 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
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var HModName = params[params[0]]; //妯″潡鍚嶇О
+ var colName = params[params[1]]; //鍒楀悕
+ colName = decodeURI(colName);//瀵筓RI 杩涜瑙ｇ爜
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+ //琛岄�夋嫨澶勭悊锛堝榻愭柟寮忥級
+ form.on('select(Alignment)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.Alignment = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //鏄惁闅愯棌
+ form.on('checkbox(IsHide)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.IsHide = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ set_AddNew(data);
+ });
+
+ //鍏ㄩ��
+ form.on('submit(CheckAll)', function (data) {//鎻愪氦
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ table.cache["mainTable"][i].IsHide = true;
+ $('#IsHide' + (i + 1)).prop("checked", true);
+ }
+ form.render('checkbox');
+ });
+
+ //鍏ㄦ竻
+ form.on('submit(ClearBill)', function (data) {//鎻愪氦
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ table.cache["mainTable"][i].IsHide = false;
+ $('#IsHide' + (i + 1)).attr("checked", false);
+ }
+ form.render('checkbox');
+ });
+
+ //涓婁竴琛�
+ form.on('submit(btn_up)', function (data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , checkData = checkStatus.data;
+ if (checkStatus.data.length != 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹Щ鍔紒');
+ }
+ else if (option.data[0]["ColumnName"] == checkData[0]["ColumnName"]) {
+ layer.msg("棣栬鏁版嵁鏃犳硶涓婄Щ锛�");
+ } else {
+ var tables = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["ColumnName"] == checkData[0]["ColumnName"]) {
+ tables.push(option.data[i - 1]);
+ checkData[0].LAY_CHECKED = true;
+ option.data[i - 1] = checkData[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ //閲嶆柊鍔犺浇涓嬫媺妗嗗拰鍗曢�夋
+ for (var j = 1; j <= option.data.length; j++) {
+ if (option.data[j - 1].IsHide == true) {
+ $("#IsHide" + j).attr("checked", true);
+ }
+ $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
+ break;
+ }
+ }
+ }
+ })
+
+ //涓嬩竴琛�
+ form.on('submit(btn_under)', function (data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , checkData = checkStatus.data;
+ if (checkStatus.data.length != 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹Щ鍔紒');
+ }
+ else if (option.data[option.data.length - 1]["ColumnName"] == checkData[0]["ColumnName"]) {
+ layer.msg("鏈鏁版嵁鏃犳硶涓嬬Щ锛�");
+ } else {
+ var tables = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["ColumnName"] == checkData[0]["ColumnName"]) {
+ tables.push(option.data[i + 1]);
+ checkData[0].LAY_CHECKED = true;
+ option.data[i + 1] = checkData[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ for (var j = 1; j <= option.data.length; j++) {
+ if (option.data[j - 1].IsHide == true) {
+ $("#IsHide" + j).attr("checked", true);
+ }
+ $('#Alignment' + j).find("option[value='" + option.data[j - 1].Alignment + "']").attr("selected", true);
+ }
+ form.render('select');
+ form.render('checkbox');
+ break;
+ }
+ }
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Exit)', function () {
+ Pub_Close(1);
+ })
+
+ //鍒犻櫎
+ form.on('submit(Del)', function () {
+ get_Del();
+ })
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ set_InitGrid();
+ get_Display();
+ }
+
+ //鏌ヨ
+ function get_Display() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
+ var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
+ var dataCol = [];//琛ㄦ牸鏁版嵁
+
+ if (data1.data.length != 0) {
+ //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+ }
+
+ colNames = colName.split(',');
+
+ if (data1.data.length != 0 && dataCol.length == colNames.length) {
+ //鍐荤粨鍒�
+ $("#HFixCols").val(data1.data[0].HFixCols);
+ //瀛椾綋澶у皬
+ $("#HFontSize").val(data1.data[0].HFontSize);
+ //鍒楀
+ $("#HColumnWidth").val(data1.data[0].HColumnWidth);
+ //榛樿鍒嗛〉
+ $("#HPageSize").val(data1.data[0].HPageSize);
+
+ //琛ㄦ牸鐨勬暟鎹～鍏�
+ for (var i = 0; i < colNames.length; i++) {
+ var dataCols = dataCol[i].split('|');
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })
+ }
+ option.data = cols;
+ table.render(option);
+
+ //椤甸潰澶氶�夋 涓嬫媺妗� 閲嶆柊娓叉煋
+ for (var i = 0; i < colNames.length; i++) {
+ var dataCols = dataCol[i].split('|');
+ if (dataCols[1] == 1) {
+ $("#IsHide" + (i + 1)).attr("checked", true);
+ }
+ $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
+ }
+ form.render('checkbox');
+ form.render('select');
+ layer.close(ajaxLoad);
+ } else {
+ //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
+ for (var i = 0; i < colNames.length; i++) {
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
+ }
+ option.data = cols;
+ table.render(option);
+
+ //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 椤甸潰澶氶�夋 涓嬫媺妗� 閲嶆柊娓叉煋
+ for (var i = 0; i < colNames.length; i++) {
+ $('#IsHide' + (i + 1)).prop("checked", false);
+ $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
+ }
+ form.render('checkbox');
+ form.render('select');
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //琛ㄦ牸鏁版嵁
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 420
+ , cellMinWidth: 90
+ , limit: 500
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', style: 'background-color:#efefef4d;' }
+ , { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;' }
+ , { field: 'ColumnName', title: '鍒楀悕', width: 100 }
+ , { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
+ , { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
+ , { field: 'ColumnWidth', title: '鍒楀', width: 100,edit: 'text' }
+ ]]
+ };
+ }
+
+ //淇濆瓨HMaker
+ function set_AddNew(data) {
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ //榛樿鍒嗛〉
+ var HPageSize = $("#HPageSize").val();
+ if (HPageSize != "") {
+ var nums = /^[0-9]+?[0-9]*$/;
+ if (!nums.test(HPageSize)) {
+ layer.msg("榛樿鍒嗛〉涓嶄负姝ｆ暣鏁�!")
+ return false;
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var OperationType = "1";
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + HModName + ';' + OperationType + ";" + sessionStorage["HUserName"];//sessionStorage["HUserName"]
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_grdAlignment_WMES/AddgrdAlignmentWMESNew",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
+ //鍒犻櫎
+ function get_Del() {
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/DelgrdAlignmentWMES',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
+
+ //#endregion
+
+ });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
index df51bb5..3f67bbe 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
@@ -29,7 +29,7 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
+ <!--<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;">
@@ -47,7 +47,7 @@
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
- </div>
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:10px">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -242,41 +242,41 @@
});
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- form.on('select(HInitTimeCycle)', function (data) {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
+ //form.on('select(HInitTimeCycle)', function (data) {
+ // var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ // //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ // if (HInitTimeCycle != -1) {
+ // $('#HBeginDate').prop('disabled', true);
+ // $('#HEndDate').prop('disabled', true);
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ // $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ // $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery();
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
- });
+ // //鎵ц鏌ヨ鏂规硶
+ // get_FastQuery();
+ // } else {
+ // $('#HBeginDate').prop('disabled', false);
+ // $('#HEndDate').prop('disabled', false);
+ // }
+ //});
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- setSelect_HInitTimeCycle();
- //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- if (HInitTimeCycle != -1) {
- $('#HBeginDate').prop('disabled', true);
- $('#HEndDate').prop('disabled', true);
- } else {
- $('#HBeginDate').prop('disabled', false);
- $('#HEndDate').prop('disabled', false);
- }
+ ////鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ //setSelect_HInitTimeCycle();
+ ////鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //if (HInitTimeCycle != -1) {
+ // $('#HBeginDate').prop('disabled', true);
+ // $('#HEndDate').prop('disabled', true);
+ //} else {
+ // $('#HBeginDate').prop('disabled', false);
+ // $('#HEndDate').prop('disabled', false);
+ //}
- //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ ////鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ //$("#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();
@@ -455,8 +455,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ //var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ //var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -530,12 +530,12 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
+ //if (HBeginDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ //}
+ //if (HEndDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ //}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -564,8 +564,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#btnSearch").click();
$("#ColContent").val("");
$("#ColName").val("0");
@@ -826,21 +826,21 @@
form.render('select');
}
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
- function setSelect_HInitTimeCycle() {
- var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
- var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+ //function setSelect_HInitTimeCycle() {
+ // var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ // var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
- var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
- for (var i = 0; i < valueList.length; i++) {
- HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
- }
+ // var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ // for (var i = 0; i < valueList.length; i++) {
+ // HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ // }
- $("#HInitTimeCycle").empty();
- $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
- form.render('select');
+ // $("#HInitTimeCycle").empty();
+ // $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ // form.render('select');
- $("#HInitTimeCycle").val("29");
- }
+ // $("#HInitTimeCycle").val("29");
+ //}
//鑾峰彇鍙傛暟
function getUrlVars() {
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 9fe3274..992a502 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"
@@ -611,7 +611,7 @@
//鍔犺浇涓氬姟鍛�
//get_HEmpName();
//闅愯棌鍕鹃�夊瓧娈�
- DisPlay_HideColumn();
+ /*DisPlay_HideColumn();*/
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
@@ -1980,7 +1980,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -1991,6 +1991,7 @@
})
}
//#endregion
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -2002,59 +2003,72 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["hmainid", "HBillType", "HSupID", "涓氬姟鐘舵��", "HUnitID", "渚涘簲鍟嗕唬鐮�", "涓氬姟鍛樹唬鐮�", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- }
-
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i]["fixed"] != null) {
- option.cols[0][i]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
- data1.data[0].HFixCols += 1;
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[4]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ newCols[0].push(option.cols[0][i+1]);
+ }
}
- option.cols[0][i + 1]["fixed"] = "left";
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
}
}
table.render(option);
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 23cd07c..f3f4f76 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"
@@ -481,6 +481,56 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
+ var titleData = ["hmainid","HBillSubType","HEmpID","HManagerID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, 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 == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
DataList = data1.data;
option.data = data1.data;
table.render(option);
@@ -799,56 +849,9 @@
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
- var data = [];//鍒楀瓧娈垫暟鎹�
- var col = [];
- var totalArray = [];
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
// var titleData = ["鍗曟嵁ID", "鍗曟嵁绫诲瀷", "HDeptID", "HUnitID", "HMaterID", "HWHID", "HSPID", "婧愬崟涓诲唴鐮�","婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
- return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
- }, 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 == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
+
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
--
Gitblit v1.9.1