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_StationInBillList.html | 65 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 34 deletions(-)
diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
index e7a00f0..37b5f39 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationInBillList.html"
@@ -144,47 +144,44 @@
,height: 'full-50'
, page: true
, cols: [[
- //{ field: 'hmainid', title: 'hmainid', width: 85 }
- { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 110 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 110 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鐢熶骇璁㈠崟', title: '鐢熶骇璁㈠崟', width: 175 }
- , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿', width: 170 }
- //, { field: 'HMaterID', title: 'HMaterID', width: 95 }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 165 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 220 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 95 }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', width: 80 }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 95 }
- //, { field: 'HProcID', title: 'HProcID', width: 90 }
- , { field: '宸ュ簭', title: '宸ュ簭', width: 95 }
- //, { field: 'HEmpID', title: 'HEmpID', width: 90 }
- , { field: '鎺ユ敹浜�', title: '鎺ユ敹浜�', width: 80 }
- , { field: '杩涚珯鎺ユ敹鏁伴噺', title: '杩涚珯鎺ユ敹鏁伴噺', width: 120 }
- , { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 182 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 80 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 182 }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 80 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 182 }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 105 }
+ //{ field: 'HEmpID', title: 'HEmpID', sort: true, width: 110 }
+ //, { field: 'HGroupID', title: 'HGroupID', width: 110 }
+ //, { field: 'HMaterID', title: 'HMaterID', sort: true, width: 165 }
+ //, { field: 'HProcID', title: 'HProcID', width: 175 }
+ //, { field: 'HSourceID', title: 'HSourceID', width: 170 }
+ { 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: 'hmainid', title: 'hmainid', width: 160 }
+ //, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 80 }
+ //, { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 80 }
+ //, { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 80 }
+ //, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 105 }
+
]]
};
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationInBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationInBillList',
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_StationInBillList;
table.render(option);
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.msg, { icon: 5 });
}
}, error: function () {
layer.msg("鎺ュ彛璇锋眰澶辫触!", {
@@ -248,16 +245,16 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/LEMS/MES_StationInBillList_Json',
+ url: GetWEBURL1() + '/api/newBill/getStationInBillList',
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_StationInBillList;
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 });
--
Gitblit v1.9.1