From 6aed4150db8079b499e18b42091a65f43b0d3963 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 一月 2021 10:23:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 16 ++++++++--------
src/main/webapp/static/js/common.js | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index 0092f27..5d138c8 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -14,28 +14,28 @@
@ExcelIgnoreUnannotated
public class MatCodeExcel {
- @ExcelProperty(value= "浜у搧浠ｅ彿*", index = 0)
+ @ExcelProperty(index = 1)
private String matNo;
- // @ExcelProperty(value= "鏉″舰鐮�", index = 4)
+ @ExcelProperty(index = 9)
private String barcode;
- @ExcelProperty(value= "浜у搧鍚嶇О", index = 3)
+ @ExcelProperty(index = 2)
private String matName;
- @ExcelProperty(value= "鍩烘湰鍗曚綅", index = 12)
+ @ExcelProperty(index = 6)
private String str1;
- @ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
+ @ExcelProperty(index = 3)
private String str2;
- @ExcelProperty(value= "棰滆壊鍚嶇О", index = 28)
+// @ExcelProperty(value= "棰滆壊鍚嶇О", index = 28)
private String str3;
- @ExcelProperty(value= "搴撲綅鍚嶇О", index = 14)
+// @ExcelProperty(value= "搴撲綅鍚嶇О", index = 14)
private String str4;
- // @ExcelProperty(value= "鍔╄鐮�", index = 7)
+ @ExcelProperty(index = 4)
private String str5;
// @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 63fea19..437c078 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -171,12 +171,12 @@
,{field: 'matName', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'str2', align: 'center',title: '瑙勬牸'}
,{field: 'str5', align: 'center',title: '鍨嬪彿'}
- ,{field: 'str6', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'str6', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'str1', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'str7', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'str3', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'str4', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str7', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'str3', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'str4', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
]
var detlCols = [
@@ -184,13 +184,13 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
,{field: 'type', align: 'center',title: '鍨嬪彿'}
- ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'color', align: 'center',title: '鏉＄爜'}
- ,{field: 'warehouse', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'brand', align: 'center',title: '鍝侀」鏁�'}
+ ,{field: 'warehouse', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'bname', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'bname', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
]
--
Gitblit v1.9.1