From 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 11 七月 2025 12:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6
src/main/webapp/views/locDetl/locDetl.html | 4
src/main/java/com/zy/asrs/entity/OrderDetl.java | 6
src/main/java/com/zy/asrs/controller/LocDetlController.java | 14 +
src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2
src/main/webapp/static/js/saas/locDetl.js | 2
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java | 2
src/main/java/com/zy/asrs/entity/WrkDetlSingle.java | 6
src/main/webapp/static/js/locDetl/locDetl.js | 6
src/main/webapp/views/locDetl/locDetl_detail.html | 236 +++++++++++++++++++++------------------
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6
src/main/java/com/zy/asrs/entity/LocDetl.java | 6
src/main/java/com/zy/asrs/entity/Mat.java | 6
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6
src/main/java/com/zy/asrs/entity/OrderDetlGift.java | 6
src/main/webapp/static/js/common.js | 4
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1
src/main/webapp/static/js/orderDetlGift/orderDetlGift.js | 2
20 files changed, 189 insertions(+), 140 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6eba1f6..feda529 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -153,12 +153,18 @@
@RequestMapping(value = "/locDetl/update/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
return R.error();
}
- locDetl.setModiUser(getUserId());
- locDetl.setModiTime(new Date());
- locDetlService.updateById(locDetl);
+ LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+ if (Cools.isEmpty(locDetl1) ){
+ return R.error();
+ }
+ locDetl1.setModiUser(getUserId());
+ locDetl1.setModiTime(new Date());
+ locDetl1.setDanger(locDetl.getDanger());
+ locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+// locDetlService.updateById(locDetl1);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index def2e2e..fdc0ef2 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -219,9 +219,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index d06aea8..9994147 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -440,9 +440,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 407fdbc..b1574a8 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -421,9 +421,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
index 86bef2b..ff583178 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java
@@ -433,9 +433,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 40b79e7..ffa9f01 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -217,9 +217,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 28b540d..d4abcb9 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -204,9 +204,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ab69cc5..e27387b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -349,9 +349,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 03a070e..988850b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -347,9 +347,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
index b8210b7..f3ea215 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlSingle.java
@@ -424,9 +424,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
index 4d7a462..3b5d4fe 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
@@ -29,7 +29,7 @@
private Double rollExtent;// 鏄� 灏忔暟鍨� 鍗烽暱搴�
private int joint = 0;// 鏄� 鏁村瀷 鎺ュご
private int cutting = 2;// 鏄� 鏁村瀷 鏄惁鍒嗗垏锛歿1:鏄��2:鍚
- private int qualified = 2;// 鏄� 鏁村瀷 鏄惁鍚堟牸锛歿1:鏄��2:鍚
+ private int qualified = 0;// 鏄� 鏁村瀷 鏄惁鍚堟牸锛歿1:鏄��2:鍚
private String modelFront = "";// 鏄� 鍒嗗垏鍓嶇鍙�
private String batchFront = "";// 鏄� 鍒嗗垏鍓嶅嵎鍙�
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4f9f19b..746719b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -819,6 +819,7 @@
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
+ waitPakin.setDanger(matList.getQualified()); //寰呭垽
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7018df0..571eac8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -213,7 +213,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -256,7 +256,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
,{field: 'rollUp', align: 'center',title: '鍗蜂俊鎭�', hide: true}
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 5e624fb..d0ab093 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -34,13 +34,15 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
];
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+
)
return cols;
}
@@ -391,6 +393,8 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
+ batch: $('#batch').val(),
+ danger: $('#danger').val(),
matnr: $('#matnr').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 7744711..6012422 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -34,7 +34,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
];
diff --git a/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
index 2ee0e49..bbcdefa 100644
--- a/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
+++ b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js
@@ -55,7 +55,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
,{field: 'source$', align: 'center',title: '鍒惰喘'}
,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 4358fc9..e88414f 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -35,7 +35,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
];
diff --git a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
index 2103c50..ec92194 100644
--- a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
+++ b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
@@ -56,7 +56,7 @@
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
,{field: 'source$', align: 'center',title: '鍒惰喘'}
,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
+ ,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 1ec1a96..544d89e 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -76,7 +76,9 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">缂栬緫</a>
+
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index 7684ede..2613794 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -15,6 +15,8 @@
<!-- 璇︽儏 -->
<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>
@@ -23,126 +25,142 @@
</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 cool-auto-complete">-->
+<!-- <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" style="display: none">-->
+<!-- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </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="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">浠� 搴� 鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="lgnum" class="layui-input" type="text" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label" style="font-size: x-small">杞偍璇锋眰缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="tbnum" 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="tbpos" class="layui-input" type="text" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="zmatid" class="layui-input" type="text" >-->
+<!-- </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 cool-auto-complete">
- <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" style="display: none">
- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label">搴撲綅鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" type="text" readonly>
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
+ <label class="layui-form-label">绠卞彿锛�</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">浠� 搴� 鍙凤細</label>
- <div class="layui-input-inline">
- <input id="lgnum" class="layui-input" type="text" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label" style="font-size: x-small">杞偍璇锋眰缂栧彿锛�</label>
- <div class="layui-input-inline">
- <input id="tbnum" 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="tbpos" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
- <div class="layui-input-inline">
- <input id="zmatid" class="layui-input" type="text" >
+ <input id="batch" class="layui-input" type="text" readonly>
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>寰呫��銆�鍒わ細</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <select id="danger" lay-verify="number">
+ <option value="0" style="display: none">寰呭垽</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">宸ャ��銆�鍘傦細</label>
- <div class="layui-input-inline">
- <input id="werks" 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="anfme" 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="altme" 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="zpallet" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鐢ㄦ埛ID锛�</label>
- <div class="layui-input-inline">
- <input id="bname" 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="memo" 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 cool-auto-complete">
- <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="modiTime$" 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">
- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="appeTime$" 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">-->
+<!-- <input id="werks" 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="anfme" 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="altme" 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="zpallet" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">鐢ㄦ埛ID锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="bname" 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="memo" 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 cool-auto-complete">-->
+<!-- <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" 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">-->
+<!-- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<hr class="layui-bg-gray">
--
Gitblit v1.9.1