From 596b25f7569404b6b3d72375f35bc0c005c3fa6a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 05 十二月 2024 13:38:51 +0800
Subject: [PATCH] 工资报表、生产订单列表、工艺路线列表、流转卡列表、工序出站汇报单列表回车查询；提料计划、缺料分析、齐套报表添加导出功能
---
WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillList.html | 32 ++
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 32 ++
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 173 +++++++++++
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 46 +++
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 47 +++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 67 ++++
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 159 ++++++++++
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 143 +++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 55 +++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 51 +++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 67 ++++
11 files changed, 859 insertions(+), 13 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index d19386f..a26f174 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -238,6 +238,53 @@
//#endregion
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鐝粍鍥炶溅鏂规硶
+ $('#HGroupName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑱屽憳鍥炶溅鏂规硶
+ $('#HEmpName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
//#region 鍒濆鍖栫晫闈�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index e0947a7..1c93dd6 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -240,6 +240,52 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鐝粍鍥炶溅鏂规硶
+ $('#HGroupName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑱屽憳鍥炶溅鏂规硶
+ $('#HEmpName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//#region 鍒濆鍖栫晫闈�
set_ClearBill();
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
index 7163a42..f405af5 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
@@ -208,6 +208,38 @@
});
//#endregion
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index fd714c3..a091176 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -227,6 +227,38 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//#region 鍒濆鍖栫晫闈�
set_ClearBill();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
index e20365e..ed52a1b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
@@ -49,6 +49,7 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
@@ -176,6 +177,7 @@
var sWhere = "";
var option = [];
var HModName = "MaterialShorAnalysisReport";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -207,6 +209,12 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery(2);
+ });
+ //#endregion
+
+ //#region 瀵煎嚭鎸夐挳
+ form.on('submit(btnExport)', function (data) {
+ getExportData();
});
//#endregion
@@ -282,11 +290,11 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: false
+ , page: true
, cellMinWidth: 90
, totalRow: true
- , limit: 20000
- , limits: [50, 500, 5000, 20000]
+ , limit: 1000
+ , limits: [50, 500,1000, 5000, 20000]
, loading: false
, cols: [columns]
, done: function (res, page, count) {
@@ -298,11 +306,16 @@
var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
if (item[dateNowTime] != null) {
if (NumCount > parseFloat(item[dateNowTime])) {
+ //搴撳瓨鏁伴噺>闇�姹傛暟閲忥細鍓╀綑鍙敤搴撳瓨鏁伴噺=搴撳瓨鏁伴噺-闇�姹傛暟閲�
NumCount -= parseFloat(item[dateNowTime]);
} else {
+ //搴撳瓨鏁伴噺<闇�姹傛暟閲忥細鍓╀綑鍙敤搴撳瓨鏁伴噺=0
+ NumCount = 0;
+
var num = 7;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
- rq = tr.children()[num + 1 + i];
+ //rq = tr.children()[num + 1 + i];
+ rq = tr.children()[num + i];
rq.style.color = '#f66161';//鐒跺悗鍙樿壊
rq = tr.children()[num];
rq.style.color = '#f66161';//鐒跺悗鍙樿壊
@@ -380,6 +393,144 @@
//#endregion
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ var data;//瀵煎嚭鐨勬暟鎹�
+ var ajaxLoad = layer.load();
+ var HORGID = $("#HORGID").val();//缁勭粐
+ var HBEGINDATE = $("#HBEGINDATE").val();//鎻愭枡鏃ユ湡
+ var HENDDATE = $("#HENDDATE").val();//鑷�
+ //var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ //var HSUPPLIERID = $("#HSUPPLIERID").val();//渚涘簲鍟�
+ //var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
+ //var HPURORDERNO = $("#HPURORDERNO").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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
+ sWhere = {
+ HORGID: HORGID
+ , HBEGINDATE: HBEGINDATE
+ , HENDDATE: HENDDATE
+ //, HMATERIALID: HMATERIALID
+ //, HSUPPLIERID: HSUPPLIERID
+ //, HXQD: HXQD
+ //, HPURORDERNO: HPURORDERNO
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/MaterialShorAnalysisReport',
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },//, "user": sessionStorage["HUserName"]
+ success: function (result) {
+ if (result.count == 1) {
+ data = result.data;
+
+ option.data = data;
+ ins = table.render(option);
+
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, data, "xls");
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ sWhere = "";
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HORGID = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 6f6febd..6871427 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -56,6 +56,7 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
@@ -200,6 +201,7 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -241,6 +243,12 @@
});
//#endregion
+ //#region 瀵煎嚭鎸夐挳
+ form.on('submit(btnExport)', function (data) {
+ getExportData();
+ });
+ //#endregion
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -261,7 +269,7 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: false
, cellMinWidth: 90
@@ -349,6 +357,139 @@
//#endregion
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ var data;//瀵煎嚭鐨勬暟鎹�
+ var ajaxLoad = layer.load();
+ var HORGID = $("#HORGID").val();//缁勭粐
+ var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
+ var HSCZYID = $("#HSCZYID").val();//鐢熶骇璧勬簮
+ var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
+ var HMOBILLNO = $("#HMOBILLNO").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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ sWhere = {
+ HORGID: HORGID
+ , HMATERIALID: HMATERIALID
+ , HDeptID: HDeptID
+ , HSCZYID: HSCZYID
+ , HXQD: HXQD
+ , HMOBILLNO: HMOBILLNO
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Complete/ReportMOMaterReadysBillList',
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },//, "user": sessionStorage["HUserName"]
+ success: function (result) {
+ if (result.count == 1) {
+ data = result.data;
+
+ option.data = data;
+ ins = table.render(option);
+
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, data, "xls");
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ sWhere = "";
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HORGID = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index 03ef44c..e6cc8e9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -48,6 +48,7 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
@@ -188,7 +189,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable','flow'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -202,8 +203,10 @@
, tree = layui.tree
, util = layui.util
, soulTable = layui.soulTable
+ , flow = layui.flow
var sWhere = " where 1=1 ";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -238,6 +241,12 @@
get_FastQuery(2);
});
//#endregion
+
+ //#region 瀵煎嚭鎸夐挳
+ form.on('submit(btnExport)', function (data) {
+ getExportData();
+ });
+ //#endregion
//#endregion
@@ -312,12 +321,12 @@
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: false
+ , page: true
, cellMinWidth: 90
- , limit: 20000
- , limits: [50, 500, 5000, 20000]
+ , limit: 1000
+ , limits: [50, 500,1000, 5000, 20000]
, totalRow: true
, loading: false
, cols: [columns]
@@ -358,7 +367,8 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], HBEGINDATE: $("#HBEGINDATE").val(), HENDDATE: $("#HENDDATE").val() },
success: function (result) {
- if (result.count == 1) {
+ if (result.count == 1) {
+
option.data = result.data;
table.render(option);
layer.close(ajaxLoad);
@@ -376,6 +386,157 @@
//#endregion
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ var data;//瀵煎嚭鐨勬暟鎹�
+ var ajaxLoad = layer.load();
+ var HORGID = $("#HORGID").val();//缁勭粐
+ var HBEGINDATE = $("#HBEGINDATE").val();//鎻愭枡鏃ユ湡
+ var HENDDATE = $("#HENDDATE").val();//鑷�
+ var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ var HSUPPLIERID = $("#HSUPPLIERID").val();//渚涘簲鍟�
+ var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
+ var HPURORDERNO = $("#HPURORDERNO").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 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
+ if (HORGID != "") {
+ sWhere += " and a.HPURCHASEORGID= " + HORGID + " ";
+ }
+
+ if (HBEGINDATE != null && HENDDATE != null) {
+ sWhere += " and HDate between ''" + HBEGINDATE + "'' and ''" + HENDDATE + "'' ";
+ }
+ if (HMATERIALID != 0) {
+ sWhere += " and B.HMaterID= " + HMATERIALID + " ";
+ }
+ if (HSUPPLIERID != 0) {
+ sWhere += " and A.HSupplierID= " + HSUPPLIERID + " ";
+ }
+ if (HXQD) {
+ sWhere += " and HSeOrderBillNo like''% " + HXQD + "%'' ";
+ }
+ if (HPURORDERNO) {
+ sWhere += " and HPOOrderBillNo like''%" + HPURORDERNO + "%'' ";
+ }
+
+ //鏌ヨ璇彞
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], HBEGINDATE: $("#HBEGINDATE").val(), HENDDATE: $("#HENDDATE").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ data = result.data;
+
+ option.data = data;
+ ins = table.render(option);
+
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, data, "xls");
+
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HORGID = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 38a775e..28ee17d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -433,6 +433,73 @@
set_ClearBill();
//#endregion
+ //#region 鍥炶溅鏌ヨ
+
+ //鐗╂枡浠ｇ爜鍥炶溅鏂规硶
+ $('#HMaterName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //瑙勬牸鍨嬪彿鍥炶溅鏂规硶
+ $('#HModel').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#WorkCenter').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //閿�鍞鍗曞彿鍥炶溅鏂规硶
+ $('#HSeOrderBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍗曟嵁绫诲瀷鍥炶溅鏂规硶
+ $('#HBillType').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍞竴ID鍥炶溅鏂规硶
+ $('#HERPID').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 4da18fb..1572830 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -585,6 +585,59 @@
})
//#endregion
+ //#region 鍥炶溅鏌ヨ
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#WorkCenter').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鐗╂枡浠ｇ爜鍥炶溅鏂规硶
+ $('#HMaterNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鐗╂枡鍚嶇О鍥炶溅鏂规硶
+ $('#HMaterName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //瑙勬牸鍨嬪彿鍥炶溅鏂规硶
+ $('#HModel').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -1452,7 +1505,7 @@
//#region 鑾峰彇瀵煎嚭鏁版嵁
function getExportData() {
- var data;;//瀵煎嚭鐨勬暟鎹�
+ var data;//瀵煎嚭鐨勬暟鎹�
var ajaxLoad = layer.load();
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
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 fc4bb68..628f210 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"
@@ -361,7 +361,9 @@
} else {
get_FastQuery();
}
- });
+ });
+
+ //#region 鍥炶溅鏌ヨ
//鐢熶骇璁㈠崟鍥炶溅鏂规硶
$('#HWorkBillNo').on('keydown', function (event) {
@@ -374,6 +376,7 @@
$("#btnSearch").click();
}
});
+
//鍗曟嵁鍙峰洖杞︽柟娉�
$('#HBillNo').on('keydown', function (event) {
var HBillNo = $('#HBillNo').val();
@@ -385,6 +388,7 @@
$("#btnSearch").click();
}
});
+
//宸ュ簭娴佽浆鍗″洖杞︽柟娉�
$('#HProcExchBillNo').on('keydown', function (event) {
var HProcExchBillNo = $('#HProcExchBillNo').val();
@@ -397,6 +401,51 @@
}
});
+ //鎿嶄綔鍛樹唬鐮佸洖杞︽柟娉�
+ $('#HEmpNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鎿嶄綔鍛樺悕绉板洖杞︽柟娉�
+ $('#HEmpName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //浜у搧浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //褰撳墠宸ュ簭鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
+
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 7b0c87c..9f7b330 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -639,6 +639,73 @@
});
//#endregion
+ //#region 鍥炶溅鏌ヨ
+
+ //璁㈠崟璺熻釜鍙峰洖杞︽柟娉�
+ $('#HOrderProcNO').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //浠诲姟鍗曞彿鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鐗╂枡鍥炶溅鏂规硶
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鎵规鍙峰洖杞︽柟娉�
+ $('#HBatchNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍞竴ID鍥炶溅鏂规硶
+ $('#HERPID').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent1').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鑷畾涔夎繃婊ゅ洖杞︽柟娉�
+ $('#ColContent2').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //#endregion
+
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
get_Dept();
--
Gitblit v1.9.1