From 24654f1681b8f00a75a867730449858affc3f59e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 08 六月 2021 09:56:21 +0800
Subject: [PATCH] 单据列显示优化
---
src/main/java/com/zy/common/service/erp/entity/CPICMO.java | 3 +++
src/main/webapp/static/js/salesOrder/erpOrder.js | 8 ++++----
src/main/java/com/zy/asrs/controller/ERPrelevantController.java | 1 +
src/main/webapp/static/js/salesOrder/salsesOrder.js | 19 ++++++++++---------
src/main/webapp/static/js/locNormal/normalReport.js | 15 ++++++++-------
5 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
index 3207738..5dad7f7 100644
--- a/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
+++ b/src/main/java/com/zy/asrs/controller/ERPrelevantController.java
@@ -31,6 +31,7 @@
MatCode matCodeObj = matCodeService.selectById(erpList.getFnumber());
if (!Cools.isEmpty(matCodeObj)) {
erpList.setFname(matCodeObj.getMatName());
+ erpList.setFmodel(matCodeObj.getStr3());
}
}
}
diff --git a/src/main/java/com/zy/common/service/erp/entity/CPICMO.java b/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
index 8bd856a..43afb20 100644
--- a/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
+++ b/src/main/java/com/zy/common/service/erp/entity/CPICMO.java
@@ -26,6 +26,9 @@
// 鐗╂枡鍚嶇О
private String Fname;
+ // 瑙勬牸
+ private String Fmodel;
+
// 鐢宠鏁伴噺锛堥渶鍏ュ簱鏁伴噺锛�
private Double FAuxQty;
diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 883d25b..480a261 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -6,15 +6,16 @@
var cols = [];
cols.push(
{field: 'appeTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
- , {field: 'warehouse', align: 'center', title: '搴撳尯'}
- , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'}
+ , {field: 'warehouse', align: 'center', title: '搴撳尯', width: 100}
+ , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜', width: 140}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
- , {field: 'lgnum', align: 'center', title: '瑙勬牸'}
- , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆'}
- , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'}
- , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿'}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺', width: 120}
+ , {field: 'lgnum', align: 'center', title: '瑙勬牸', width: 120}
+ , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆', width: 120}
+ , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿', width: 140}
+ , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿', width: 140}
, {field: 'altme', align: 'center', title: '鍗曚綅', hide: true}
- , {field: 'anfme', align: 'center', title: '鏁伴噺'}
+ , {field: 'memo', align: 'center', title: '澶囨敞'}
)
return cols;
}
diff --git a/src/main/webapp/static/js/salesOrder/erpOrder.js b/src/main/webapp/static/js/salesOrder/erpOrder.js
index 29bdb78..26b863c 100644
--- a/src/main/webapp/static/js/salesOrder/erpOrder.js
+++ b/src/main/webapp/static/js/salesOrder/erpOrder.js
@@ -1,11 +1,11 @@
function getCol() {
var cols = [];
cols.push(
- {field: 'fbillNo', align: 'center', title: '閫氱煡鍗曞彿'}
- , {field: 'fsourceBillNo', align: 'center', title: '鐢熶骇鍗曞彿'}
- , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栫爜'}
+ {field: 'fbillNo', align: 'center', title: '閫氱煡鍗曞彿', width: 180}
+ , {field: 'fsourceBillNo', align: 'center', title: '鐢熶骇鍗曞彿', width: 180}
+ , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栫爜', width: 180}
, {field: 'fname', align: 'center', title: '鐗╂枡鍚嶇О'}
- , {field: 'fmodel', align: 'center', title: '瑙勬牸'}
+ , {field: 'fmodel', align: 'center', title: '瑙勬牸', width: 180}
);
return cols;
}
diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index f3159b4..1b9da5e 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -4,18 +4,19 @@
function getCol() {
var cols = [];
cols.push(
- {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿'}
- , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡'}
- , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜'}
- , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О'}
- , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿'}
- , {field: 'invUnit', align: 'center', title: '鍗曚綅'}
- , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺'}
+ {field: 'orderCode', align: 'center', title: '璁㈠崟缂栧彿', width: 120}
+ , {field: 'orderDate', align: 'center', title: '璁㈠崟鏃ユ湡', width: 180}
+ , {field: 'invCode', align: 'center', title: '鐗╂枡缂栫爜', width: 180}
+ , {field: 'invName', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
+ , {field: 'invStd', align: 'center', title: '瑙勬牸鍨嬪彿', width: 180}
+ , {field: 'invUnit', align: 'center', title: '鍗曚綅', width: 80}
+ , {field: 'orderQty', align: 'center', title: '璁㈠崟鏁伴噺', width: 120}
+ , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺', width: 120}
, {field: 'izMrp', align: 'center', title: '鏄惁mrp璁＄畻', hide: true}
- , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�'}
+ , {field: 'productQty', align: 'center', title: '鐢熶骇浠诲姟鍗曟暟閲�', width: 140}
, {field: 'izReceive', align: 'center', title: '鏄惁鏀舵枡', hide: true}
, {field: 'inQty', align: 'center', title: '浜ф垚鍝佸叆搴撴暟閲�'}
- , {field: 'outQty', align: 'center', title: '鍙戣揣鏁伴噺'}
+
);
return cols;
}
--
Gitblit v1.9.1