From 96785ebcfe1bc9210f3d9d4056f4ec29fb60d810 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 10:58:22 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产报表/Sc_ProdOrderPickingStatusReport.html | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
index 76efc4c..3f0c498 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
@@ -34,33 +34,32 @@
<span>鏇村</span>
</div>
</div>
- <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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
- </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="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HDeptName" style="width:190px;">
- </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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
</div>
</div>
- <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="HDeptName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;margin-bottom:5px;margin-left:20px">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-inline">
@@ -87,9 +86,8 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
-
-
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ <!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row">
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
<div class="layui-inline">
@@ -175,7 +173,8 @@
</div>
</div>
</div>
- </div>
+ </div>-->
+
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -184,7 +183,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
</div>
</script>
</form>
@@ -214,6 +212,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+ var titleData = [];
var ins;//瀛樺偍鏁版嵁 瀵煎嚭鍔熻兘闇�瑕佺敤鍒扮殑鍙傛暟
var HModName = "Sc_ProdOrderPickingStatusReport";
//#endregion
@@ -271,9 +270,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
- //DisPlay_HideColumn();
- ColFilter();
+ get_FastQuery();
}
//鍒濆鍖栬〃鏍�
@@ -305,31 +302,36 @@
success: function (data1) {
var col = [];
if (data1.count == 1) {
- var data = [];
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
- data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- //鍒ゆ柇鏄惁鏄函鑻辨枃
- var patrn = new RegExp("[\u4E00-\u9FA5]+");
- for (var i = 0; i < data.length; i++) {
- if (!patrn.test(data[i].name)) {
- col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '璁＄畻', hide: true });
+ 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 {
+ 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 {
switch (data[i].Type) {
+ //int
case 'DateTime':
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</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 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 160, totalRow: true });
break;
default:
- col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
}
@@ -478,6 +480,7 @@
$("#ColName2").append(Organization);
form.render('select');
}
+
//瀵煎嚭Execel
function get_Export() {
table.exportFile(ins.config.id, option.data, "xls");
--
Gitblit v1.9.1