From 469be99743f499c38d710056d17609f384b6e66d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 10:26:27 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 10 ++++-
src/main/webapp/views/pakout/pakout.html | 41 +++++++++++++++++++-
src/main/webapp/static/js/pakout/pakout.js | 26 ++++++++----
3 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/pakout/pakout.js b/src/main/webapp/static/js/pakout/pakout.js
index 3bec522..67b1c88 100644
--- a/src/main/webapp/static/js/pakout/pakout.js
+++ b/src/main/webapp/static/js/pakout/pakout.js
@@ -21,13 +21,12 @@
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
- ,{field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺'}
- ,{field: 'nodeId', align: 'center',title: '鍏宠仈璐т綅', hide: true}
- ,{field: 'locNo', align: 'center',title: '璐т綅'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺', style: 'font-weight: bolder', width: 100}
+ ,{field: 'locNo', align: 'center',title: '璐т綅'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
+ // ,{field: 'nodeId', align: 'center',title: '鍏宠仈璐т綅', hide: true}
,{field: 'name', align: 'center',title: '鍚嶇О', hide: true}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
@@ -35,19 +34,20 @@
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '璐х墿鏉＄爜', hide: true}
,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
- ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'count', align: 'center',title: '鏁伴噺', hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
- ,{field: 'createTime$', align: 'center',title: '鐢熸垚鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', templet: '#wrkStsTpl', width: 100}
+ ,{field: 'createTime$', align: 'center',title: '鐢熸垚鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
]],
request: {
pageName: 'curr',
@@ -108,6 +108,10 @@
table.on('toolbar(pakout)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
+ case 'batchPrint':
+
+
+ break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
@@ -299,7 +303,11 @@
elem: '#updateTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 0c3e630..004642f 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -221,10 +221,16 @@
<div class="console-app-name">鐢ㄦ埛</div>
</div>
</div>
+<!-- <div class="layui-col-xs6 layui-col-sm3">-->
+<!-- <div class="console-app-group" lay-href="custOrder/custOrder.html?resourceId=30442" lay-text="閿�鍞鍗�">-->
+<!-- <i class="console-app-icon layui-icon layui-icon-form" style="color: #b37feb;font-size: 30px;"></i>-->
+<!-- <div class="console-app-name">璁㈠崟</div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-col-xs6 layui-col-sm3">
- <div class="console-app-group" lay-href="custOrder/custOrder.html?resourceId=30442" lay-text="閿�鍞鍗�">
+ <div class="console-app-group" lay-href="pakout/pakout.html?resourceId=30435" lay-text="鎷ｈ揣宸ヤ綔妗�">
<i class="console-app-icon layui-icon layui-icon-form" style="color: #b37feb;font-size: 30px;"></i>
- <div class="console-app-name">璁㈠崟</div>
+ <div class="console-app-name">鎷ｈ揣鍗�</div>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/pakout/pakout.html b/src/main/webapp/views/pakout/pakout.html
index ca2e300..6380f93 100644
--- a/src/main/webapp/views/pakout/pakout.html
+++ b/src/main/webapp/views/pakout/pakout.html
@@ -30,7 +30,31 @@
</div>
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="鍑哄簱璐т綅" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -44,8 +68,8 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn " id="btn-add" lay-event="batchPrint" style="margin-left: 10px">鎵撳嵃鎷ｈ揣鍗�</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -57,6 +81,17 @@
{{# } }}
<a class="layui-btn layui-btn-xs" lay-event="detail">璇︽儏</a>
</script>
+<script type="text/html" id="wrkStsTpl">
+ <span name="wrkSts"
+ {{# if( d.wrkSts === 1){ }}
+ class="layui-badge layui-badge-blue"
+ {{# }else if(d.wrkSts === 2){ }}
+ class="layui-badge layui-badge-red"
+ {{# }else if(d.wrkSts === 3){ }}
+ class="layui-badge layui-badge-green"
+ {{# } }}
+ >{{d.wrkSts$}}</span>
+</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
--
Gitblit v1.9.1