From 46b10d520f13e5aa34cc0b02bae3aff58166981a Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 21 一月 2021 20:27:14 +0800
Subject: [PATCH] 登录用户信息增加工序号，工序汇报页面优化
---
WebTM/views/工序汇报/MES_StationOutBillList.html | 88 ++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 56 deletions(-)
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
index 152336a..69789d2 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBillList.html"
@@ -106,68 +106,44 @@
,height: 'full-50'
, page: true
, cols: [[
- { field: '閫夋嫨', title: '閫夋嫨', width: 110 }
- //, { field: 'hmainid', title: 'hmainid', width: 110 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 175 }
- , { field: '妫�楠屽憳', title: '妫�楠屽憳', width: 170 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 165 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
- //, { field: 'HProcExchInterID', title: 'HProcExchInterID', width: 220 }
- , { field: '瀹㈡埛鏉＄爜', title: '瀹㈡埛鏉＄爜', width: 95 }
- , { field: '瀹㈡埛鏉＄爜NEW', title: '瀹㈡埛鏉＄爜NEW', width: 80 }
- , { field: '鎵规鍙�', title: '鎵规鍙�', width: 95 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 95 }
- //, { field: 'HProcID', title: 'HProcID', width: 80 }
- , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 120 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 182 }
- //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 182 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 80 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 182 }
- //, { field: 'HunitID', title: 'HunitID', width: 105 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 105 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 105 }
- , { field: '妯＄┐鍙�', title: '妯＄┐鍙�', width: 105 }
- , { field: '鐗╂枡杈呭姪1', title: '鐗╂枡杈呭姪1', width: 105 }
- , { field: '鐗╂枡杈呭姪2', title: '鐗╂枡杈呭姪2', width: 105 }
- , { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105 }
- //, { field: 'HEmpID', title: 'HEmpID', width: 105 }
- , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 105 }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
- , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 105 }
- , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 105 }
- , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', width: 105 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 105 }
- , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 105 }
- , { field: '宸ユ椂', title: '宸ユ椂', width: 105 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 105 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 105 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 105 }
- //, { field: 'HSubID', title: 'HSubID', width: 105 }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 105 }
- //, { field: 'HBillType', title: 'HBillType', width: 105 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 105 }
+ { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 120 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 80 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 165 }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 100 }
+ , { field: 'LOT鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 100 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 100 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 100 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 100 }
+ //,{ field: 'HEmpID', title: 'HEmpID', width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', sort: true, width: 165 }
+ //, { field: 'HMaterID', title: 'HMaterID', width: 175 }
+ //, { field: 'HProcID', title: 'HProcID', width: 170 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 165 }
+ //, { field: 'hmainid', title: 'hmainid', width: 95 }
+ //, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
+ //, { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺', width: 182 }
+ //, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 105 }
+ //, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 105 }
+ //, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
]]
};
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- console.log(data1)
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationOutBillList;
table.render(option);
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
layer.msg("鎺ュ彛璇锋眰澶辫触!", {
@@ -201,19 +177,19 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationOutBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationOutBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
+ if (data1.code == 1) {
+ option.data = data1.data.h_v_MES_StationOutBillList;
table.render(option);
layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
--
Gitblit v1.9.1