From ed8555e7a444f5e40f8de2ed36b65224fa471cff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 14 七月 2020 14:04:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/matCode/matCode.js | 42 ++++++-
src/main/webapp/views/matCode/matCode_detail.html | 206 +++++++++++++++++++++++++++++++++++-----
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/resources/application.yml | 2
4 files changed, 214 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index c5f5a8d..8277141 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,7 +15,7 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="127.0.0.1:1433;databasename=gdasrs";
+ generator.url="127.0.0.1:1433;databasename=dlasrs";
generator.username="sa";
generator.password="sa@123";
generator.table="asr_wrk_detl_log";
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 858b676..a3210c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=gdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 11d7618..1d2861f 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -23,17 +23,43 @@
{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: 'str4', align: 'center',title: '瀹㈡埛'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ // ,{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: 'status', align: 'center',title: ''}
-
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 35c982c..146c560 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -15,21 +15,21 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form">
- <!--
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
</div>
- </div>
- -->
+ -->
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栫爜锛�</label>
<div class="layui-input-inline">
<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%;display: none">
+ <div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏉°��銆�鐮侊細</label>
<div class="layui-input-inline">
<input id="barcode" class="layui-input" type="text">
@@ -42,36 +42,186 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <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%;">
- <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%;">
- <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%;">
<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%;">
- <label class="layui-form-label">瀹㈡埛锛�</label>
+ <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-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-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-input-inline">
+ <input id="num2" 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="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">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">鍒� 寤� 鑰咃細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
--
Gitblit v1.9.1