From 4e467ce59d2cc7e6b111de5435b1fda896241f6a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 14 七月 2020 13:55:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java              |   51 +++++++
 src/main/java/com/zy/asrs/entity/LocDetl.java                  |    4 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java    |   49 +-----
 src/main/java/com/zy/asrs/entity/MatCode.java                  |    6 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |   33 ----
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |    7 
 src/main/webapp/static/js/matCode/matCode.js                   |   43 +-----
 src/main/webapp/views/matCode/matCode_detail.html              |  172 +-----------------------
 src/main/java/com/zy/asrs/entity/WrkDetl.java                  |    4 
 9 files changed, 95 insertions(+), 274 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 8be72f5..96e715d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -38,7 +38,7 @@
     /**
      * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "浠撳簱鍙�")
+    @ApiModelProperty(value= "瑙勬牸")
     private String lgnum;
 
     /**
@@ -56,7 +56,7 @@
     /**
      * 鐗╂枡鏍囩ID
      */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
+    @ApiModelProperty(value= "棰滆壊")
     private String zmatid;
 
     /**
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index bfa7e5d..10d2feb 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -52,10 +52,10 @@
     @ApiModelProperty(value= "鐗╂枡瑙勬牸")
     private String str2;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "棰滆壊")
     private String str3;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "瀹㈡埛")
     private String str4;
 
     @ApiModelProperty(value= "")
@@ -115,7 +115,7 @@
     @ApiModelProperty(value= "")
     private String str23;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "閲嶉噺")
     private Double num1;
 
     @ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 58cbe5b..db9451b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -40,7 +40,7 @@
     /**
      * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "浠撳簱鍙�")
+    @ApiModelProperty(value= "瑙勬牸")
     private String lgnum;
 
     /**
@@ -58,7 +58,7 @@
     /**
      * 鐗╂枡鏍囩ID
      */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
+    @ApiModelProperty(value= "棰滆壊")
     private String zmatid;
 
     /**
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c3e32e1..048d893 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -11,6 +11,7 @@
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
 import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.model.LocDetlDto;
 import com.zy.common.model.OutLocDto;
 import com.zy.common.model.StartupDto;
@@ -52,8 +53,6 @@
     private AdjDetlService adjDetlService;
     @Autowired
     private WrkMastLogService wrkMastLogService;
-    @Autowired
-    private WrkDetlLogService wrkDetlLogService;
 
     @Override
     @Transactional
@@ -215,16 +214,9 @@
                 WrkDetl wrkDetl = new WrkDetl();
                 wrkDetl.setWrkNo(workNo);
                 wrkDetl.setIoTime(new Date());
-                wrkDetl.setMatnr(detlDto.getLocDetl().getMatnr());
                 Double anfme = ioType==101?detlDto.getCount():detlDto.getLocDetl().getAnfme();
                 wrkDetl.setAnfme(anfme); // 鏁伴噺
-                wrkDetl.setZmatid(detlDto.getLocDetl().getZmatid());
-                wrkDetl.setTbpos(detlDto.getLocDetl().getTbpos());
-                wrkDetl.setTbnum(detlDto.getLocDetl().getTbnum());
-                wrkDetl.setLgnum(detlDto.getLocDetl().getLgnum());
-                wrkDetl.setAltme(detlDto.getLocDetl().getAltme());
-                wrkDetl.setBname(detlDto.getLocDetl().getBname());
-                wrkDetl.setMaktx(detlDto.getLocDetl().getMaktx());
+                VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
                 wrkDetl.setAppeTime(new Date());
                 wrkDetl.setAppeUser(userId);
                 wrkDetl.setModiTime(new Date());
@@ -420,6 +412,7 @@
         wrkMast.setPicking("N"); // 鎷f枡
         wrkMast.setExitMk("N"); // 閫�鍑�
         wrkMast.setEmptyMk(sourceLoc.getLocType().equals("D")?"Y":"N"); // 绌烘澘
+        wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
         wrkMast.setLinkMis("N");
         wrkMast.setAppeUser(userId);
         wrkMast.setAppeTime(new Date());
@@ -435,15 +428,8 @@
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setIoTime(new Date());
-            wrkDetl.setMatnr(locDetl.getMatnr());
             wrkDetl.setAnfme(locDetl.getAnfme());
-            wrkDetl.setZmatid(locDetl.getZmatid());
-            wrkDetl.setTbpos(locDetl.getTbpos());
-            wrkDetl.setTbnum(locDetl.getTbnum());
-            wrkDetl.setLgnum(locDetl.getLgnum());
-            wrkDetl.setAltme(locDetl.getAltme());
-            wrkDetl.setBname(locDetl.getBname());
-            wrkDetl.setMaktx(locDetl.getMaktx());
+            VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
             wrkDetl.setAppeTime(new Date());
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(new Date());
@@ -523,17 +509,8 @@
                 MatCode matCode = matCodeService.selectById(adjust.getMatnr());
                 LocDetl locDetl = new LocDetl();
                 locDetl.setLocNo(locMast.getLocNo());
-                locDetl.setMatnr(matCode.getMatNo());
-                locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
                 locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
-                locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-                // todo:luxiaoao
-                locDetl.setLgnum("寰呭畾"); // 浠撳簱鍙�
-                locDetl.setTbnum(0); // 杞偍璇锋眰缂栧彿
-                locDetl.setTbpos(0); // 琛岄」鐩�
-                locDetl.setZmatid("寰呭畾"); // 鐗╂枡鏍囩ID
-                locDetl.setZpallet("寰呭畾"); // 鎵樼洏鏉$爜
-
+                VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
                 locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
                 locDetl.setModiTime(new Date());
                 locDetl.setAppeUser(userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index fe31337..0273900 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.mapper.WrkDetlMapper;
 import com.zy.asrs.service.MatCodeService;
 import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.utils.VersionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,13 +38,9 @@
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setIoTime(new Date());
-            wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
             wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+            VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
             wrkDetl.setZpallet(barcode); // 鎵樼洏鏉$爜
-            wrkDetl.setLgnum("寰呭畾"); // todo
-            wrkDetl.setTbnum(0); // todo
-            wrkDetl.setTbpos(0); // todo
-            wrkDetl.setZmatid("寰呭畾"); // todo
             wrkDetl.setAppeUser(userId);
             wrkDetl.setAppeTime(new Date());
             wrkDetl.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index e6c949d..d1c0950 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -5,6 +5,7 @@
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.VersionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -83,25 +84,11 @@
                                 exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                             }
                         } else {
-                            locDetl = new LocDetl(
-                                    wrkMast.getLocNo(), // 搴撲綅鍙�
-                                    wrkDetl.getMatnr(), // 鐗╂枡鍙�
-                                    null,    // 浠撳簱鍙�
-                                    null,    // 杞偍璇锋眰缂栧彿
-                                    null,    // 琛岄」鐩�
-                                    null,    // 鐗╂枡鏍囩ID
-                                    wrkDetl.getMaktx(),    // 鐗╂枡鎻忚堪
-                                    null,    // 宸ュ巶
-                                    wrkDetl.getAnfme(),    // 鏁伴噺
-                                    wrkDetl.getAltme(),    // 鍗曚綅
-                                    wrkDetl.getZpallet(),    // 鎵樼洏鏉$爜
-                                    null,    // 鐢ㄦ埛ID
-                                    null,    // 澶囨敞
-                                    null,    // 淇敼浜哄憳
-                                    now,    // 淇敼鏃堕棿
-                                    null,    // 鍒涘缓鑰�
-                                    now    // 娣诲姞鏃堕棿
-                            );
+                            locDetl = new LocDetl();
+                            locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+                            locDetl.setModiTime(now);
+                            locDetl.setAppeTime(now);
                             if (!locDetlService.insert(locDetl)) {
                                 exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                             }
@@ -171,25 +158,11 @@
                                 exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                             }
                         } else {
-                            locDetl = new LocDetl(
-                                    wrkMast.getLocNo(), // 搴撲綅鍙�
-                                    wrkDetl.getMatnr(), // 鐗╂枡鍙�
-                                    null,    // 浠撳簱鍙�
-                                    null,    // 杞偍璇锋眰缂栧彿
-                                    null,    // 琛岄」鐩�
-                                    null,    // 鐗╂枡鏍囩ID
-                                    wrkDetl.getMaktx(),    // 鐗╂枡鎻忚堪
-                                    null,    // 宸ュ巶
-                                    wrkDetl.getAnfme(),    // 鏁伴噺
-                                    wrkDetl.getAltme(),    // 鍗曚綅
-                                    wrkDetl.getZpallet(),    // 鎵樼洏鏉$爜
-                                    null,    // 鐢ㄦ埛ID
-                                    null,    // 澶囨敞
-                                    null,    // 淇敼浜哄憳
-                                    now,    // 淇敼鏃堕棿
-                                    null,    // 鍒涘缓鑰�
-                                    now    // 娣诲姞鏃堕棿
-                            );
+                            locDetl = new LocDetl();
+                            locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+                            locDetl.setModiTime(now);
+                            locDetl.setAppeTime(now);
                             if (!locDetlService.insert(locDetl)) {
                                 exceptionHandle("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                             }
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
new file mode 100644
index 0000000..21a5ed9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -0,0 +1,51 @@
+package com.zy.asrs.utils;
+
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.WrkDetl;
+
+/**
+ * Created by vincent on 2020/7/14
+ */
+public class VersionUtils {
+
+    public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
+        wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+        wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+        wrkDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+        wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+        wrkDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+    }
+
+    public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
+        wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
+        wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
+        wrkDetl.setZmatid(locDetl.getZmatid()); // 棰滆壊
+        wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+        wrkDetl.setBname(locDetl.getBname()); // 鐢ㄦ埛ID
+        wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
+    }
+
+    public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
+        locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+        locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+        locDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+        locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+        locDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+    }
+
+    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
+        locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
+        locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
+        locDetl.setZmatid(wrkDetl.getZmatid()); // 棰滆壊
+        locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+        locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+        locDetl.setBname(wrkDetl.getBname()); // 鐢ㄦ埛ID
+        locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
+    }
+
+}
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 5cab270..11d7618 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -23,45 +23,18 @@
             {type: 'checkbox'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
-            ,{field: 'barcode', align: 'center',title: '鏉$爜'}
+            // ,{field: 'barcode', align: 'center',title: '鏉$爜'}
             ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
+            ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
+            ,{field: 'str3', align: 'center',title: '棰滆壊'}
+            ,{field: 'num1', align: 'center',title: '閲嶉噺'}
             ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
-            // ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
-            // ,{field: 'str3', align: 'center',title: ''}
-            // ,{field: 'str4', align: 'center',title: ''}
-            // ,{field: 'str5', align: 'center',title: ''}
-            // ,{field: 'str6', align: 'center',title: ''}
-            // ,{field: 'str7', align: 'center',title: ''}
-            // ,{field: 'str8', align: 'center',title: ''}
-            // ,{field: 'str9', align: 'center',title: ''}
-            // ,{field: 'str10', align: 'center',title: ''}
-            // ,{field: 'str11', align: 'center',title: ''}
-            // ,{field: 'str12', align: 'center',title: ''}
-            // ,{field: 'str13', align: 'center',title: ''}
-            // ,{field: 'str14', align: 'center',title: ''}
-            // ,{field: 'str15', align: 'center',title: ''}
-            // ,{field: 'str16', align: 'center',title: ''}
-            // ,{field: 'str17', align: 'center',title: ''}
-            // ,{field: 'str18', align: 'center',title: ''}
-            // ,{field: 'str19', align: 'center',title: ''}
-            // ,{field: 'str20', align: 'center',title: ''}
-            // ,{field: 'str21', align: 'center',title: ''}
-            // ,{field: 'str22', align: 'center',title: ''}
-            // ,{field: 'str23', align: 'center',title: ''}
-            // ,{field: 'num1', align: 'center',title: ''}
-            // ,{field: 'num2', align: 'center',title: ''}
-            // ,{field: 'num3', align: 'center',title: ''}
-            // ,{field: 'num4', align: 'center',title: ''}
-            // ,{field: 'num5', align: 'center',title: ''}
-            // ,{field: 'num6', align: 'center',title: ''}
-            // ,{field: 'date1$', align: 'center',title: ''}
-            // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
-            // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'str4', align: 'center',title: '瀹㈡埛'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
             // ,{field: 'status', align: 'center',title: ''}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
         request: {
             pageName: 'curr',
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index b9b440c..35c982c 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -29,7 +29,7 @@
                 <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
+        <div class="layui-inline"  style="width:31%;display: none">
             <label class="layui-form-label">鏉°��銆�鐮侊細</label>
             <div class="layui-input-inline">
                 <input id="barcode" class="layui-input" type="text">
@@ -42,183 +42,33 @@
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label">鐗╂枡鍗曚綅锛�</label>
-            <div class="layui-input-inline">
-                <input id="str1" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
             <label class="layui-form-label">鐗╂枡瑙勬牸锛�</label>
             <div class="layui-input-inline">
                 <input id="str2" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
+        <div class="layui-inline"  style="width:31%;">
+            <label class="layui-form-label">棰滆壊锛�</label>
             <div class="layui-input-inline">
                 <input id="str3" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str4" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str5" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str6" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str7" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str8" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str9" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str10" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str11" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str12" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str13" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str14" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str15" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str16" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str17" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str18" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str19" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str20" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str21" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str22" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="str23" class="layui-input" type="text">
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
+        <div class="layui-inline"  style="width:31%;">
+            <label class="layui-form-label">閲嶉噺锛�</label>
             <div class="layui-input-inline">
                 <input id="num1" class="layui-input" type="text" lay-verify="number" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
+        <div class="layui-inline"  style="width:31%;">
+            <label class="layui-form-label">鐗╂枡鍗曚綅锛�</label>
             <div class="layui-input-inline">
-                <input id="num2" class="layui-input" type="text" lay-verify="number" >
+                <input id="str1" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
+        <div class="layui-inline"  style="width:31%;">
+            <label class="layui-form-label">瀹㈡埛锛�</label>
             <div class="layui-input-inline">
-                <input id="num3" class="layui-input" type="text" lay-verify="number" >
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="num4" class="layui-input" type="text" lay-verify="number" >
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="num5" class="layui-input" type="text" lay-verify="number" >
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="num6" class="layui-input" type="text" lay-verify="number" >
-            </div>
-        </div>
-        <div class="layui-inline"  style="width:31%;display: none">
-            <label class="layui-form-label">锛�</label>
-            <div class="layui-input-inline">
-                <input id="date1$" class="layui-input" type="text" autocomplete="off">
+                <input id="str4" class="layui-input" type="text">
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;display: none">

--
Gitblit v1.9.1