From 22031c10ead96768f0af46b3559d282c84f0eabf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 04 十月 2024 12:59:48 +0800
Subject: [PATCH] 1
---
WebTM/WebTM.csproj.user | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 83 ---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 121 ----
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 154 +++++-
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 319 ++++++++++---
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 1
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 3
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 320 +++++--------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 170 +++++-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 149 +++++-
11 files changed, 744 insertions(+), 586 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..6cd52dd 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 32f02dd..ecd78c8 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,12 +7,12 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/"; //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
- //var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
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_Material.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_Material.html"
index a7d8ff9..4cd842b 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_Material.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_Material.html"
@@ -362,7 +362,6 @@
}
});
-
//#region 閲嶆柊鍚屾鎸夐挳
form.on('submit(btnResCnz)', function (data) {
set_ResCnz();
@@ -553,7 +552,6 @@
}
}
-
option.cols = [col];
option.data = data1.data;
ins = table.render(option);
@@ -1038,6 +1036,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
type: "GET",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
success: function (data1) {
if (data1.count == 1) {
layer.close(ajaxLoad);
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_BarCodeBillList.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_BarCodeBillList.html"
index 7813033..958fbf0 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_BarCodeBillList.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_BarCodeBillList.html"
@@ -218,7 +218,8 @@
var option = [];
var ins;
var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -318,6 +319,7 @@
$("#HMaterNumber").val("");
sWhere = "";
get_Display(sWhere);
+
break;
//浣滃簾鎸夐挳
case 'set_Drop': set_DropBill(0);
@@ -386,8 +388,11 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
form.render('select');
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ }
sWhere = "";
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
});
//#endregion
@@ -412,19 +417,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like '%" + ColContent + "%'";
+ com = "like ''%" + ColContent + "%''";
break;
case "8":
- com = "like '" + ColContent + "%'";
+ com = "like ''%" + ColContent + "''";
break;
case "9":
- com = "like '%" + ColContent + "'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like '%" + ColContent + "%'";
+ com = "not like ''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -434,19 +439,19 @@
if (ColName1 != 0 && Comparator1 != 0) {
switch (Comparator1) {
case "7":
- com1 = "like '%" + ColContent1 + "%'";
+ com1 = "like ''%" + ColContent1 + "%''";
break;
case "8":
- com = "like '" + ColContent1 + "%'";
+ com1 = "like ''%" + ColContent1 + "''";
break;
case "9":
- com = "like '%" + ColContent1 + "'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like '%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -456,49 +461,51 @@
if (ColName2 != 0 && Comparator2 != 0) {
switch (Comparator) {
case "7":
- com2 = "like '%" + ColContent2 + "%'";
+ com2 = "like ''%" + ColContent2 + "%''";
break;
case "8":
- com = "like '" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com = "like '%" + ColContent2 + "'";
+ com2 = "like ''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like '%" + ColContent2 + "%'";
+ com2 = "not like ''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ com2 = "" + Comparator2 + "''" + ColContent2 + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
}
if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HBeginDate + "''";
}
if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HEndDate + "''";
}
if (HBarCode) {
- sWhere += " and 鏉＄爜缂栧彿 like '%" + HBarCode + "%'";
+ sWhere += " and 鏉＄爜缂栧彿 like ''%" + HBarCode + "%''";
}
if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like'%" + HMaterName + "%'";
+ sWhere += " and 鐗╂枡鍚嶇О like''%" + HMaterName + "%''";
}
if (HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like'%" + HMaterNumber + "%'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like''%" + HMaterNumber + "%''";
}
if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ sWhere += " and 婧愬崟鍗曞彿 like ''%" + HSourceBillNo + "%''";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//#endregion
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -514,10 +521,9 @@
//鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
$("#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();
+
//鏌ヨ
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
@@ -525,68 +531,153 @@
get_DefaultModule();
}
function set_InitGrid() {
- option = {
+ option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
- , totalRow: true
+ , page: true
+ , totalRow: true
, cellMinWidth: 90
, limits: [50, 500, 5000, 20000]
- , limit: 50
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
- , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 160, sort: true }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 160, sort: true }
- , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 250, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250, sort: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200, sort: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200, sort: true }
- , { field: '鐐夊彿', title: '鐐夊彿', width: 200, sort: true }
- , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200, sort: true }
- , { field: '鏉＄爜鐘舵��', title: '鏉＄爜鐘舵��', width: 200, sort: true }
- , { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
- , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
- , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
- , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160, sort: true }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160, sort: true }
- , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160, sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true}
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200, sort: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
- , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200, sort: true }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200, sort: true }
- , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200, sort: true }
- , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115, sort: true }
- , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115, sort: true }
- , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
- , { field: '杞﹂棿', title: '杞﹂棿', width: 115, sort: true }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200, sort: true }
- , { field: '鎷栧彿', title: '鎷栧彿', width: 200, sort: true }
- , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200, sort: true, totalRow: true }
- , { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
- , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115, sort: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200, sort: true }
- , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200, sort: true }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115, sort: true }
- , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鍏ュ簱鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鍏ュ簱鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200, templet: "<div>{{d.閿�鍞嚭搴撴棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞嚭搴撴棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
- ]]
+ , limit: 50
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 160, sort: true }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 160, sort: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 250, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250, sort: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200, sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200, sort: true }
+ , { field: '鐐夊彿', title: '鐐夊彿', width: 200, sort: true }
+ , { field: '閽㈠嵎鍙�', title: '閽㈠嵎鍙�', width: 200, sort: true }
+ , { field: '鏉＄爜鐘舵��', title: '鏉＄爜鐘舵��', width: 200, sort: true }
+ , { field: '鍘傚晢', title: '鍘傚晢', width: 200, sort: true }
+ , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200, sort: true }
+ , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, sort: true }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160, sort: true }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160, sort: true }
+ , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160, sort: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 200, sort: true, totalRow: true }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200, sort: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
+ , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200, sort: true }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200, sort: true }
+ , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200, sort: true }
+ , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115, sort: true }
+ , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115, sort: true }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
+ , { field: '杞﹂棿', title: '杞﹂棿', width: 115, sort: true }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200, sort: true }
+ , { field: '鎷栧彿', title: '鎷栧彿', width: 200, sort: true }
+ , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200, sort: true, totalRow: true }
+ , { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
+ , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115, sort: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200, sort: true }
+ , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200, sort: true }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115, sort: true }
+ , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鍏ュ簱鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鍏ュ簱鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200, templet: "<div>{{d.閿�鍞嚭搴撴棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞嚭搴撴棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
+ ]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
-
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBillList/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#endregion
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
@@ -696,6 +787,70 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
}
+ }
+ //#endregion
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBillList/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//#endregion
@@ -880,7 +1035,7 @@
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>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
}
}
$("#ColName").empty();
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 88f8d21..3cd1486 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"
@@ -371,7 +371,8 @@
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
window.HInterID_Choose = 0;
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#endregion
//鍒濆鍖栬〃鏍�
@@ -854,6 +855,28 @@
, { field: '鐗╂枡鍒嗙被', title: '鐗╂枡鍒嗙被', sort: true }
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
@@ -1027,6 +1050,70 @@
}
//#endregion
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillListPage',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ 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(number) {
var HDate = $("#HDate").val();;//寮�濮嬫棩鏈�
@@ -1057,19 +1144,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -1080,19 +1167,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like''%" + ColContent1 + "%''";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like''%" + ColContent1 + "''";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -1101,19 +1188,19 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "%''";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ com2 = "" + Comparator2 + "''" + ColContent2 + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -1132,51 +1219,51 @@
sWhere += "";
}
if (HSF == "宸蹭笅鎺�") {
- sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like '%" + HSF + "%' ";
+ sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like ''%" + HSF + "%'' ";
}
if (HSF == "閮ㄥ垎涓嬫帹") {
- sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like '%" + HSF + "%' ";
+ sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like ''%" + HSF + "%'' ";
}
if (HSF == "鏈笅鎺�") {
- sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like '%" + HSF + "%' ";
+ sWhere += " and 鏄惁涓嬫帹鐢熸垚娴佽浆鍗� like ''%" + HSF + "%'' ";
}
}
if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
}
if (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
if (HOrderProcNO) {
- sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ sWhere += " and 璁㈠崟璺熻釜鍙� like ''%" + HOrderProcNO + "%''";
}
if (HSeOrderBillNo) {
- sWhere += " and 閿�鍞鍗曞彿 like '%" + HSeOrderBillNo + "%'";
+ sWhere += " and 閿�鍞鍗曞彿 like ''%" + HSeOrderBillNo + "%''";
}
if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + WorkCenter + "%''";
}
if (HMaterName) {
- sWhere += " and 浜у搧浠ｇ爜 like '%" + HMaterName + "%'";
+ sWhere += " and 浜у搧浠ｇ爜 like ''%" + HMaterName + "%''";
}
if (HDeptName && HDeptName != 0) {
sWhere += " and HDeptID = " + HDeptName;
}
if (HStatus && HStatus != 0) {
- sWhere += " and 鐘舵�� like '%" + HStatus + "%'";
+ sWhere += " and 鐘舵�� like ''%" + HStatus + "%''";
}
if (HBillType) {
- sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HBillType + "%'";
+ sWhere += " and 鍗曟嵁绫诲瀷 like ''%" + HBillType + "%''";
}
if (HErpID) {
- sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
+ sWhere += " and 鍞竴ID like ''%" + HErpID + "%''";
}
if (HModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HModel + "%''";
}
if (number == 3) {
if (HProject) {
- sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
}
}
//if (HSF) {
@@ -1190,7 +1277,7 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
}
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index 3bf0ede..02341cf 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -509,7 +509,6 @@
}
-
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
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 ddd5c58..625d0e6 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"
@@ -201,11 +201,6 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(瀹氶鐢宠鍗�)</button>
@@ -244,9 +239,10 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Gy_RoutingBillList";
- var HBillType = 3301;
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//鑾峰彇鍙傛暟
function getUrlVars() {
@@ -291,21 +287,6 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
- break;
- //鍙戣捣瀹℃壒
- case 'set_startCheckBill': set_startCheckBill();
- break;
- //鏌ョ湅瀹℃壒杩涘害
- case 'get_CheckFlowInfo': get_CheckFlowInfo();
- break;
- //澶氱骇瀹℃牳
- case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
- break;
- //澶氱骇鍙嶅鏍�
- case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
- break;
- //椹冲洖
- case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
break;
//澶氳涓嬫帹
case 'btn-ProcPriceRequestBills': set_ProcPriceRequestBills();
@@ -513,6 +494,28 @@
//, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
@@ -623,7 +626,6 @@
//sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
sWhere += " and HMaterID = " + HMaterID;
- sWhere += " and 瀹℃牳浜� != ''";
}
if (HProID != 0 && HProID != "undefined" && HProID != null) {
sWhere += " and HMainProcID = " + HProID;
@@ -754,19 +756,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -776,19 +778,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like''%" + ColContent1 + "%''";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like''%" + ColContent1 + "''";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -797,19 +799,19 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "%''";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator + "'" + ColContent + "'";
+ com2 = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -819,10 +821,10 @@
} else {
if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
}
if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
}
@@ -834,32 +836,96 @@
}
if (HOrderProcNO) {
- sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ sWhere += " and 鍗曟嵁绫诲瀷 like ''%" + HOrderProcNO + "%''";
}
if (HMaterName) {
- sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ sWhere += "and 鐗╂枡鍚嶇О like ''%" + HMaterName + "%''";
}
if (HMaterNumber) {
- sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ sWhere += "and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%''";
}
if (HModel) {
- sWhere += "and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ sWhere += "and 瑙勬牸鍨嬪彿 like ''%" + HModel + "%''";
}
if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + WorkCenter + "%''";
}
if (HOrgID) {
- sWhere += " and HOrgID = '" + HOrgID + "'";
+ sWhere += " and HOrgID = ''" + HOrgID + "''";
}
if (number==2) {
if (HProject!='0') {
- sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
}
}
- sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType<>'SUB'"
- get_Display(sWhere);
+ sWhere += " and 宸ュ簭浠ｇ爜 != ''9999'' and HBillSubType<>''SUB''"
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//#endregion
@@ -1062,7 +1128,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
@@ -1098,149 +1164,6 @@
}
}
-
- //#region 鍙戣捣瀹℃壒
- function set_startCheckBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/StartCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "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 });
- }
- });
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //#endregion
-
- //#region 鏌ョ湅瀹℃壒杩涘害
- function get_CheckFlowInfo() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].hmainid.toString();
- layer.open({
- type: 2
- , area: ['70%', '70%']
- , title: '鍗曟嵁瀹℃壒杩涘害'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
- , resize: false,
- end: function () {
- ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
- //if (get_needClose_Bar == 0) {
- // $("#btnSearch").trigger('click');
- //} else if (get_needClose_Bar == 1) {
- // $("#get_needClose").trigger('click');
- //}
- }
- , cancel: function () {
-
- }
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
- }
- }
- //#endregion
-
- //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
- function set_CheckBill_Flow(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
- 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_RejectCheck_Flow(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
- 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
//鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
function set_CloseBill(num) {
@@ -1305,7 +1228,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["field"] + ",";
+ colName += option.cols[0][i]["title"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -1340,7 +1263,6 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- async:"false",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -1377,10 +1299,6 @@
if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
option.cols[0][i + 1]["hide"] = false;
}
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -1392,10 +1310,6 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -1450,7 +1364,7 @@
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].title + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
}
$("#ColName").empty();
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_StationOutBill.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_StationOutBill.html"
index fc6a915..5431b90 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_StationOutBill.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_StationOutBill.html"
@@ -1190,89 +1190,6 @@
getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
break;
- case "P20":
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HICMOInterID": data.hicmointerid,
- "HICMOBillNo": data.浠诲姟鍗曞彿,
- "HMaterID": data.HMaterID,
- "HMaterName": data.浜у搧,
- "HMaterNumber": data.浜у搧浠ｇ爜,
- "HMaterModel": data.瑙勬牸鍨嬪彿,
- "HPieceQty": data.娴佽浆鍗℃暟閲�,
- "HPlanQty": data.娴佽浆鍗℃暟閲�,
- "lngBillKey": data.hmainid,
- "HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchHinteID": data.hmainid,
- "HProcPlanEntryID": data.hsubid,
- "HICMOQty": data.浠诲姟鍗曟暟閲�,
- "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HPRDOrgID": data.缁勭粐
- });
- //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
- //$("#HBarCode").css("background-color", "#efefef4d");
- HProcExchBillNoFlag = true;
-
- var HProcExchHinteID = $('#HProcExchHinteID').val();
- var HInterID = data.hmainid;
- //鑷姩鍖归厤娴佹按鍙�
- $.ajax({
- url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
- type: "GET",
- data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
- success: function (data1) {
- if (data1.count == 1) {
- var data = data1.data[0];
- form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "lngBillSubKey": data.hsubid,
- "HProcName": data.宸ュ簭,
- "HProcID": data.宸ュ簭ID,
- "HProcNo": data.娴佹按鍙�,
- "HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID,
- "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
- });
-
- if (data.棣栭亾宸ュ簭 == "鏄�") {
- FirstEndHProcNo = 1;
- } else if (data.鏈亾宸ュ簭 == "鏄�") {
- FirstEndHProcNo = 2;
- }
- $("#HProcNo").attr("readonly", "readonly");
- $("#HProcNo").css("background-color", "#efefef4d");
- }
- }
- })
-
- option = {
- elem: '#mainTable',
- url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
- //, cellMinWidth: 80
- toolbar: '#toolbarDemo'
- , where: { HProcExchHinteID: HProcExchHinteID }
- , cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
- , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
- ]]
- , height: 500
- }
- table.render(option)
-
- getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
-
- break;
}
//layer.close(index);
//set_InitGrid();
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 3ca460f..9bc8cbf 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"
@@ -257,17 +257,15 @@
var option2 = [];
var option3 = [];
var option4 = [];
- var ins; //鐢ㄤ簬瀵煎嚭excel
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
+ var ins; //鐢ㄤ簬瀵煎嚭excel
var HModName = "Cj_StationOutBillList";
var HModName1 = "Sc_StationOutBillSub_TechParam";
var HModName2 = "Sc_StationOutBillSub_Note";
var HModName3 = "Sc_StationOutBillSub_SN";
var HModName4 = "Sc_StationOutBillSub_Emp";
var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var params = get_UrlVars();
- var sProcExchBillNo = params[params[0]] == null ? "undefined" : params[params[0]]; //娴佽浆鍗″彿锛堝伐搴忔祦杞崱涓嬫煡鐢ㄥ埌锛�
- var OperationType = params[params[1]] == null ? 1 : params[params[1]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
- var ViewName = params[params[2]] == null ? "h_v_MES_StationOutBillList" : params[params[2]]; //鎵�璋冪敤鐨勮鍥�
//#region 銆愯繃婊ゆ柟妗堛��
@@ -291,6 +289,7 @@
//宸ュ簭娴佽浆鍗′笅鏌ユ爣璁�
var lookDownBar = 0; //(0:涓嬫煡鎿嶄綔锛�1锛氱洿鎺ユ煡鐪�)
+ var params = get_UrlVars(); //鑾峰彇鍙傛暟
//鍒濆鍖栬〃鏍�
@@ -302,6 +301,7 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ get_FastQuery();
});
//鏌ヨ鎸夐挳
@@ -640,11 +640,32 @@
none: '鏃犳暟鎹紒'
}
};
- set_ClearQuery();
- get_FastQuery();
-
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
+ set_ClearQuery();
+ get_FastQuery();
//鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
@@ -1581,8 +1602,8 @@
//蹇�熻繃婊�
function get_FastQuery() {
//鍒ゆ柇鏄惁涓轰笅鏌ユ搷浣滐紝鑻ユ槸鍒欏彉鏇存煡璇㈠崟鍙峰拰鏃堕棿杩囨护鏉′欢
- if (sProcExchBillNo != "undefined" && lookDownBar == 0) {
- $("#HProcExchBillNo").val(sProcExchBillNo);
+ if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(params[params[0]]);
$("#HBeginDate").val("1990-01-01");
$("#HEndDate").val("2200-12-30");
lookDownBar = 1;
@@ -1608,56 +1629,56 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName+ " "+ com;
}
if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= ''" + HBeginDate + "''";
}
if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= ''" + HEndDate + "''";
}
if (HWorkBillNo) {
- sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ sWhere += " and 浠诲姟鍗� like ''%" + HWorkBillNo + "%''";
}
if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
if (HProcExchBillNo) {
- sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like ''%" + HProcExchBillNo + "%''";
}
if (HProcExchBillNo) {
- sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like ''%" + HProcExchBillNo + "%''";
}
if (checkHWasterQty) {
sWhere += " and 鎶ュ簾鏁伴噺>0 ";
}
if (HNumber) {
- sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ sWhere += " and 浜у搧浠ｇ爜 like ''%" + HNumber + "%''";
}
if (HName) {
- sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
+ sWhere += " and 褰撳墠宸ュ簭 like ''%" + HName + "%''";
}
if (HEmpNumber) {
- sWhere += " and 鎿嶄綔鍛樹唬鐮� like '%" + HEmpNumber + "%'";
+ sWhere += " and 鎿嶄綔鍛樹唬鐮� like ''%" + HEmpNumber + "%''";
}
if (HEmpName) {
- sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
+ sWhere += " and 鎿嶄綔鍛� like ''%" + HEmpName + "%''";
}
if (HStatus) {
@@ -1676,25 +1697,101 @@
default:
}
}
- sWhere += " and HBillSubType<>'SUB'";
- get_Display(sWhere);
+ sWhere += " and HBillSubType<>''SUB''";
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
//鍔犺浇缃戞牸
function get_Display(sWhere) {
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
var ajaxLoad = layer.load();
var wait = layer.load();
$.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- url: GetWEBURL() + '/Cj_StationOutBillController/GetSc_StationOutBillList_Json',
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sWhere": sWhere, "HMaker": sessionStorage["HUserName"], "HBillSubType": "3791", "OperationType": OperationType, "ViewName": ViewName },
-
- //url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
- //type: "GET",
- //data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ //success: function (data1) {
+ // if (data1.count == 0) {
+ // option.data = [];
+ // layer.alert(data1.Message, { icon: 5 });
+ // } else {
+ // option.data = data1.data;
+ // }
+ // table.render(option);
+ // btnIs();
+ // if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ // }
+ // layer.close(wait);
+ //}, error: function () {
+ // layer.close(wait);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //}
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -1702,11 +1799,6 @@
//缁欑┖鐨勬暟缁勮祴鍊�
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: '鍚堣' });
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 13bf017..434120c 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"
@@ -346,7 +346,8 @@
var wybj = false;
var QJQD = 0;//鍒ゆ柇鍣ㄥ叿娓呭崟鏌ヨ鍒楄〃鏄惁鏈夋暟鎹� 0娌℃湁 1鏈�
var Organization = sessionStorage["Organization"]
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 銆愯繃婊ゆ柟妗堛��
@@ -581,6 +582,12 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
+
});
//#endregion
@@ -655,6 +662,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
+ $("#HWorkBillNo").val("");//浠诲姟鍙�
+ $("#HDeptName").val("0");//鐢熶骇杞﹂棿
$("input[type='checkbox'][name='wybj']").prop('checked', false);
form.render("checkbox");//濮斿鏍囪
@@ -669,7 +678,7 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
-
+
$("#ColContent1").val("");
$("#ColName1").val("0");
$("#Comparator1").val("0");
@@ -712,19 +721,19 @@
var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + "''" + ColContent + "''";
break;
}
sWhere += " and " + ColName + " " + com;
@@ -734,19 +743,19 @@
var com1 = "";
switch (Comparator1) {
case "7":
- com1 = "like'%" + ColContent1 + "%'";
+ com1 = "like''%" + ColContent1 + "%''";
break;
case "8":
- com1 = "like'%" + ColContent1 + "'";
+ com1 = "like''%" + ColContent1 + "''";
break;
case "9":
- com1 = "like'" + ColContent1 + "%'";
+ com1 = "like''" + ColContent1 + "%''";
break;
case "10":
- com1 = "not like'%" + ColContent1 + "%'";
+ com1 = "not like''%" + ColContent1 + "%''";
break;
default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
break;
}
sWhere += " and " + ColName1 + " " + com1;
@@ -756,19 +765,19 @@
var com2 = "";
switch (Comparator2) {
case "7":
- com2 = "like'%" + ColContent2 + "%'";
+ com2 = "like''%" + ColContent2 + "%''";
break;
case "8":
- com2 = "like'%" + ColContent2 + "'";
+ com2 = "like''%" + ColContent2 + "''";
break;
case "9":
- com2 = "like'" + ColContent2 + "%'";
+ com2 = "like''" + ColContent2 + "%''";
break;
case "10":
- com2 = "not like'%" + ColContent2 + "%'";
+ com2 = "not like''%" + ColContent2 + "%''";
break;
default:
- com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ com2 = "" + Comparator2 + "''" + ColContent2 + "''";
break;
}
sWhere += " and " + ColName2 + " " + com2;
@@ -786,45 +795,45 @@
}
}
if (wybj) {
- sWhere += " and 濮斿鏍囪 = 'Y'";
+ sWhere += " and 濮斿鏍囪 = ''Y''";
}
if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + HDate + "''";
}
if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + HDate1 + "''";
}
if (HWorkBillNo) {
- sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HWorkBillNo + "%'";
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like ''%" + HWorkBillNo + "%''";
}
if (HOrderProcNO) {
- sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
+ sWhere += " and 璁㈠崟璺熻釜鍙� like ''%" + HOrderProcNO + "%''";
}
if (SHname) {
- sWhere += " and 瀛愪欢浠ｇ爜 like '%" + SHname + "%'";
+ sWhere += " and 瀛愪欢浠ｇ爜 like ''%" + SHname + "%''";
}
if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''"
}
if (HDeptName != "0") {
- sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
+ sWhere += " and HWorkShopID like ''%" + HDeptName + "%''"
}
if (HErpID) {
- sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
+ sWhere += " and 鍞竴ID like ''%" + HErpID + "%''";
}
if (HBatchNo) {
- sWhere += " and 鎵规鍙� like '%" + HBatchNo + "%'";
+ sWhere += " and 鎵规鍙� like ''%" + HBatchNo + "%''";
}
if (number==2) {
if (HProject) {
- sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ sWhere += " and 椤圭洰鍙� like ''%" + HProject + "%''";
}
}
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -845,6 +854,70 @@
});
+ //#endregion
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessExchangeBillList/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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 });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [[]]
+ table.render(option);
+ layer.close(ajaxLoad);
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//鏌ヨ瀛愯〃鏁版嵁
@@ -1239,7 +1312,28 @@
// , { field: '鍖呰鏍囪瘑缂栫爜', title: '鍖呰鏍囪瘑缂栫爜', width: 80 }
]]
};
- //table.render(option);
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//鍒濆鍖栦粠琛ㄥ垪琛� 宸ヨ壓娴佺▼
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_ProcessExchangeBill_BatchSplit.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_ProcessExchangeBill_BatchSplit.html"
index 9fb5012..d604409 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_ProcessExchangeBill_BatchSplit.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_ProcessExchangeBill_BatchSplit.html"
@@ -16,7 +16,6 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
- <script src="../../../layuiadmin/grwebapp.js"></script>
<style type="text/css">
.layui-form-item .layui-inline {
margin-right: 0;
@@ -52,8 +51,7 @@
<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" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_Print" disabled>鎵撳嵃</button>
- <button type="button" id="batchPrint-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵归噺鎵撳嵃</button>
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -241,15 +239,10 @@
});
//鎵撳嵃
- form.on('submit(get_Print)', function () {
- get_Print();
- })
-
- //鎵归噺鎵撳嵃
form.on('submit(get_BatchPrint)', function () {
get_BatchPrint();
})
-
+
//閫�鍑烘寜閽�
form.on('submit(Exit)', function () {
if (params[1] != null) {
@@ -274,8 +267,7 @@
, { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
- , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍐呯爜', width: 120 }//鐢熶骇璁㈠崟鍙�
- , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -283,7 +275,6 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -300,8 +291,8 @@
//鍒濆琛ㄦ牸鏁版嵁
var rowdata = [{
- "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
- , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
+ "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
+ , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
, "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
}];
@@ -341,13 +332,11 @@
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
- , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
+ , "HMaterID": subdata[i].HMaterID, "鐗╂枡浠ｇ爜": subdata[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
- , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
- , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
- , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
- , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
+ , "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
+ , "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
+ , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": "", "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
}
)
}
@@ -363,7 +352,6 @@
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', width: 100, hide: true }//鐢熶骇璁㈠崟鍐呯爜
, { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//鐢熶骇璁㈠崟瀛愬唴鐮�
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', width: 120 }//鐢熶骇璁㈠崟鍙�
- , { field: 'HWorkShopID', title: '鐢熶骇杞﹂棿鍐呯爜', width: 100, hide: true }//鐢熶骇杞﹂棿鍐呯爜
, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
@@ -371,7 +359,6 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
@@ -458,7 +445,6 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
- $('#batchPrint-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵归噺鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
@@ -491,7 +477,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html?HMaterID=' + obj.data.HMaterID + '&HProID=' + 0, 'yes']
+ , content: ["../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -519,7 +505,7 @@
}
//鎵撳嵃
- function get_Print() {
+ function get_BatchPrint() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
@@ -543,91 +529,6 @@
else {
layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑娴佽浆鍗★紒');
}
- }
-
-
- //鎵归噺鎵撳嵃
- var time;
- var num = 0;
- function get_BatchPrint() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
-
- if (checkStatus.data.length > 0) {
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
- time = setInterval(function () {
- dy_PL(data);
- }, 1000);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- })
- }
- else {
- layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
- }
- }
-
- function dy_PL(rest) {
- var HInterID = rest[num].HInterID.toString();
- var sWhere = "select cast( b.娴佹按鍙� as float) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.娴佽浆鍗℃暟閲�,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭浠ｇ爜,b.宸ュ簭鍚嶇О,a.鎵瑰彿,b.宸ヨ壓宸ヤ綔涓績,b.宸ヨ壓宸ヨ壓鍙傛暟,a.鐢熶骇杞﹂棿,b.宸ユ鍚嶇О,b.鐢熶骇璁㈠崟鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in(" + HInterID + ") and b.宸ュ簭浠ｇ爜 != '9999' order by cast(b.娴佹按鍙� as int)"
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: { "sWhere": sWhere },
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
- if (data.data.length != 0) {
- var dataPrint = [];
- for (var i = 0; i < data.data.length; i++) {
- data.data[i]["娴佹按鍙�"] = data.data[i]["娴佹按鍙�"].toFixed(1);
- dataPrint.push(data.data[i])
- }
-
- var Customer = {
- "Table": dataPrint
- }
-
- var args = {
- type: "print",//鎵撳嵃妯″紡
- //type: "preview",//棰勮妯″紡
- showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娴佽浆鍗SON.grf"),
- data: Customer
- };
-
- console.log(data.data[0].鍗曟嵁鍙�);
- //var args = {
- // report: urlAddRandomNo("../../grf/cs10.grf"),
- // data: Customer
- //};
- webapp_ws_ajax_run(args);
-
- if (rest.length <= num + 1) {
- num = 0;
- clearInterval(time);
- } else {
- num++;
- }
-
- } else {
- layer.msg("鏌ユ棤鏁版嵁!");
- }
-
- }
- else {
- layer.msg(data.Message, { icon: 5 });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
- }
- })
-
}
//琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
--
Gitblit v1.9.1