From 02eb447f5b70008f23851391073033293056e5ca Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 21 六月 2023 13:59:51 +0800 Subject: [PATCH] 增加轮询MES接口功能,增加物料档案类与隔膜信息类,增加orderdetl qr_code,startdate,enddate三个字段 --- src/main/webapp/static/js/order/order.js | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index ad09170..65b1a96 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -122,12 +122,13 @@ cellMinWidth: 100, cols: [[ {type: 'numbers'}, - {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, - {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, - {field: 'batch', title: '鎵瑰彿'}, + {field: 'matnr', title: '鐗╂枡缂栫爜', width: 160}, + {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 160}, + {field: 'batch', title: '鐢熶骇鎵瑰彿'}, {field: 'anfme', title: '鏁伴噺'}, - {field: 'workQty', title: '浣滀笟鏁伴噺'}, - {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'}, + {field: 'qty', title: '杈呮暟閲�'}, + {field: 'qrCode', title: '鏉″舰鐮�'}, + //{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'}, // {field: 'unit', title: '鍗曚綅'}, // { // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { @@ -136,7 +137,7 @@ // }, // {field: 'inQty', title: '宸插叆搴撻噺'}, // {field: 'color', title: '棰滆壊'}, - {field: 'specs', title: '瑙勬牸'} + {field: 'specs', title: '瑙勬牸/鍨嬪彿'} ]], request: { pageName: 'curr', @@ -234,13 +235,14 @@ cellMinWidth: 100, cols: [[ {type: 'numbers', title: '#'}, - {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, - {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200}, - {field: 'batch', title: '鎵瑰彿', edit: true}, - {field: 'specs', title: '瑙勬牸'}, - {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110}, - {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100}, + {field: 'matnr', title: '鐗╂枡缂栫爜', width: 160}, + {field: 'maktx', title: '鐗╂枡鍚嶇О', width: 200}, + {field: 'batch', title: '鐢熶骇鎵瑰彿', edit: true}, + {field: 'specs', title: '瑙勬牸/鍨嬪彿'}, + {field: 'anfme', title: '鏁伴噺', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110}, + //{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100}, // {field: 'unit', title: '鍗曚綅', width: 80}, + {field: 'qty', title: '杈呮暟閲�' , edit: true}, {field: 'memo', title: '澶囨敞' , edit: true}, {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'} ]], -- Gitblit v1.9.1