From 9bcb7fe6ed1b97da7cd8b8f5af3e5c08a2bc7ff0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 19 九月 2025 08:50:07 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/mat/mat.html | 125 ++++++++++++++++++++---------------------
1 files changed, 61 insertions(+), 64 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f4035a4..02e1337 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -97,6 +97,12 @@
<input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧瑙勬牸:</label>
+ <div class="layui-input-inline">
+ <input name="specs" class="layui-input" placeholder="杈撳叆鍟嗗搧瑙勬牸"/>
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -131,12 +137,12 @@
<li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>
<li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>
<li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>
- <hr>
- <li class="title">2nd menu</li>
- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>
+<!-- <hr>-->
+<!-- <li class="title">2nd menu</li>-->
+<!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
</ul>
</div>
-<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>
</div>
</script>
@@ -151,7 +157,7 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/mat/mat.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/mat/mat.js?v=1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -193,16 +199,23 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">SKC</label>
+ <label class="layui-form-label">閰嶇疆</label>
<div class="layui-input-block">
- <input name="barcode" placeholder="璇疯緭鍏ユ潯鐮�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曚环</label>
+ <label class="layui-form-label">鍗曠鍑�閲�</label>
<div class="layui-input-block">
- <input name="price" type="number" placeholder="璇疯緭鍏ュ崟浠�" class="layui-input">
+ <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曠浣撶Н</label>
+ <div class="layui-input-block">
+ <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
</div>
</div>
@@ -219,14 +232,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚綅</label>
- <div class="layui-input-block">
- <input name="unit" placeholder="璇疯緭鍏ュ崟浣�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
</div>
</div>
@@ -237,16 +243,19 @@
</div>
</div>
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label layui-form-required">鐘舵��</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <select name="status" lay-vertype="tips" lay-verify="required" required="">-->
- <!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
- <!-- <option value="1">姝ｅ父</option>-->
- <!-- <option value="0">绂佺敤</option>-->
- <!-- </select>-->
- <!-- </div>-->
- <!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曠姣涢噸</label>
+ <div class="layui-input-block">
+ <input name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曠浣撶Н</label>
+ <div class="layui-input-block">
+ <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
@@ -271,26 +280,20 @@
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
<div id="template-container" style="margin: 20px;text-align: center">
-
<!-- 棰勮鍥� 1 -->
<div id="template-preview-1" class="template-preview" style="display: inline-block">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
- <td class="barcode" colspan="9" align="center" scope="col">
- <img class="template-code template-barcode" src="" width="90%;">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
- <span>xxxxxx</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5">xxxxxx-xx/xx</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">xx</td>
- </tr>
- </table>
+ <div style="width: 150px;height: 300px;">
+ <div>
+ <img class="template-qrcode" src="">
+ <div>xxxxx</div>
+ </div>
+ <div>
+ 鍚嶇О锛歺xxx
+ </div>
+ <div>
+ 瑙勬牸锛歺xxxx
+ </div>
+ </div>
</div>
<!-- 棰勮鍥� 2 -->
@@ -350,26 +353,20 @@
</script>
<!-- 妯℃澘寮曟搸 -->
-<!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1" class="template-barcode">
+<script type="text/template" id="templatePreview1" class="template-qrcode">
{{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
- <td align="center" class="barcode" colspan="9" scope="col">
- <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>{{this.matnr}}</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
- </tr>
- </table>
+ <div style="width: 150px;">
+ <div>
+ <img class="template-qrcode" src="{{this.barcodeUrl}}">
+ <div style="text-align: center;">{{this.matnr}}</div>
+ </div>
+ <div style="font-size: 12px;">
+ 鍚嶇О锛歿{this.maktx}}
+ </div>
+ <div style="font-size: 12px;">
+ 瑙勬牸锛歿{this.specs}}
+ </div>
+ </div>
{{/each}}
</script>
<!-- 妯℃澘2 -->
--
Gitblit v1.9.1