From 70b86bb70e6941127888979dbde37dda3b1db0b6 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 19 十一月 2024 09:14:43 +0800
Subject: [PATCH] 完善下架功能
---
zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html | 112 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html b/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
index 2cfbdb6..1ef1231 100644
--- a/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
+++ b/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
@@ -10,8 +10,8 @@
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
- <style>
- /* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
+ <!--<style>
+ /* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
.contain {
border-collapse: collapse;
width: 280px;
@@ -72,6 +72,77 @@
padding: 8px;
}
+ .template-preview {
+ height: 200px;
+ display: inline-block;
+ }
+
+ /*----------------------------------*/
+ .function-area {
+ padding: 20px 50px;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ display: none;
+ }
+ #btn-outbound {
+ display: none;
+ }
+ </style>-->
+ <style>
+ body {
+ color: #595959;
+ background-color: #f5f7f9;
+ }
+
+ .layui-fluid {
+ padding: 15px;
+ }
+
+ .layui-form.layui-border-box.layui-table-view {
+ /*margin: 15px 0 35px 0;*/
+ width: 100%;
+ border-width: 1px;
+ }
+
+ .layui-form.layui-border-box.layui-table-view {
+ height: calc(100vh - 160px);
+ }
+
+ .layui-form.layui-border-box.layui-table-view {
+ margin: 0;
+ }
+
+ #search-box {
+ padding: 30px 30px 10px 0px;
+ margin-left: 0px;
+ }
+
+ .layui-form.layui-border-box.layui-table-view {
+ height: 100%;
+ }
+
+ .admin-form {
+ padding: 25px 30px 0 0 !important;
+ margin: 0 !important;
+ }
+
+ /* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
+ .template-preview {
+ height: 200px;
+ display: inline-block;
+ }
+
+ .contain td {
+ border: 1px solid #000;
+ /*font-family: 榛戜綋;*/
+ /*font-weight: bold;*/
+ /*color: #000000;*/
+ }
</style>
</head>
<body>
@@ -109,6 +180,10 @@
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
<i class="layui-icon"></i>閲嶇疆
</button>
+ <!-- 鍔熻兘鍖� -->
+ </div>
+ <div class="layui-inline">
+ <button class="function-btn layui-btn icon-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆寰呮墦鍗扮墿鏂欐ā鏉夸笅杞�</button>
</div>
</div>
</div>
@@ -117,22 +192,33 @@
</div>
</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
-
+ <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆鐗╂枡鎵撳嵃</button>
+ <span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">瀵煎叆鐗╂枡淇℃伅</span>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
- <!-- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>-->
+<!-- 琛ㄦ牸 -->
+<div style="padding-bottom: 5px; margin-bottom: 45px">
-</script>
+ <!-- 澶撮儴 -->
+ <script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ <!-- 3.瀵煎叆绠卞彿鍑哄簱 -->
+ <!-- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>-->
+
+ </script>
+
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</div>
<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>
@@ -308,7 +394,7 @@
{{#each data}}
<table class="contain" width="300"
style="overflow: hidden;font-size: xx-small;table-layout: fixed;margin-top: 20px;">
- <tr style="height: 20px">
+ <tr style="height: 15px">
<td align="center" scope="col" colspan="1" style="font-size: 10px;">鍚嶇О</td>
<td align="center" scope="col" colspan="2" style="font-size: 10px;">{{this.maktx}}</td>
<td align="center" scope="col" colspan="3" rowspan="4">
@@ -318,19 +404,19 @@
</div>
</td>
</tr>
- <tr style="height: 20px">
+ <tr style="height: 15px">
<td align="center" colspan="1" style="font-size: 10px;">鍒朵护</td>
<td align="center" colspan="2"
style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.decrees}}
</td>
</tr>
- <tr style="height: 20px">
+ <tr style="height: 15px">
<td align="center" colspan="1" style="font-size: 10px;">鏈哄瀷</td>
<td align="center" colspan="2"
style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.model}}
</td>
</tr>
- <tr style="height: 20px">
+ <tr style="height: 15px">
<td align="center" colspan="1" style="font-size: 10px;">鍥惧彿</td>
<td align="center" colspan="2"
style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.imgNum}}
@@ -346,7 +432,7 @@
style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.material}}
</td>
</tr>
- <tr style="height: 20px">
+ <tr style="height: 10px">
<td align="center" colspan="1" style="font-size: 10px;">閲嶉噺</td>
<td align="center" colspan="2"
style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;font-size: 10px;">{{this.weight}}
--
Gitblit v1.9.1