From db08b0f3239df006eadea02d004451ab6a90eb5f Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期日, 11 八月 2024 15:51:35 +0800
Subject: [PATCH] 1
---
WebTM/views/仓存管理/条码报表/Kf_BarCodeOutInReport.html | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 53 deletions(-)
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_BarCodeOutInReport.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_BarCodeOutInReport.html"
index c5d468f..583d5d6 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_BarCodeOutInReport.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_BarCodeOutInReport.html"
@@ -418,68 +418,67 @@
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sWhere": sWhere },
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;
- }
+ //鏃犺鏈夋棤鏁版嵁鍏堝姞杞絚ol
+ 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', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- 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;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- if (data[i].name == '鏁伴噺') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- }
-
- columns = col;
-
- //璁剧疆璧嬪�煎垪瀹�
- var colWidth = getColumnsWidth();
- if (colWidth == "" || colWidth == []) {
-
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
- $.each(columns, function (x, m) {
- m["width"] = colWidth[x];
- });
+ 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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
}
- option.cols = [columns];
+ }
+
+ columns = col;
+
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ option.cols = [columns];
+ if (data1.count == 1) {
option.data = data1.data;
option.totalRow = true;
table.render(option);
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
--
Gitblit v1.9.1