From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/views/nodeLoc/nodeLoc.html | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/nodeLoc/nodeLoc.html b/src/main/webapp/views/nodeLoc/nodeLoc.html
index 0fa9012..d49c584 100644
--- a/src/main/webapp/views/nodeLoc/nodeLoc.html
+++ b/src/main/webapp/views/nodeLoc/nodeLoc.html
@@ -88,7 +88,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="padding: 8px 15px 8px 15px">搴撳尯:</label>
<div class="layui-input-inline">
- <input name="parent_name" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="parent_name" 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="name" class="layui-input" placeholder="杈撳叆搴撲綅缂栧彿"/>
</div>
</div>
<div class="layui-inline"> 
@@ -116,19 +122,19 @@
<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="printBatch">鎵归噺鎵撳嵃</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-<!-- <div class="dropdown-menu" style="float: right">-->
-<!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
-<!-- <ul class="dropdown-menu-nav dark">-->
-<!-- <div class="dropdown-anchor"></div>-->
-<!-- <li class="title">1st menu</li>-->
-<!-- <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>-->
-<!-- </ul>-->
-<!-- </div>-->
+ <!-- <div class="dropdown-menu" style="float: right">-->
+ <!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
+ <!-- <ul class="dropdown-menu-nav dark">-->
+ <!-- <div class="dropdown-anchor"></div>-->
+ <!-- <li class="title">1st menu</li>-->
+ <!-- <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>-->
+ <!-- </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>-->
</div>
</script>
@@ -206,7 +212,7 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <table class="contain" width="400px" style="overflow: hidden;font-size: xx-large;table-layout: fixed; color:#000;">
<tr style="height: 150px; border: none">
<td class="barcode" colspan="12" align="center" scope="col" style=" border: none">
<img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;">
@@ -221,11 +227,11 @@
<!-- 妯℃澘2 -->
<script type="text/template" id="templatePreview2" class="template-barcode">
{{#each data}}
- <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
+ <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xxx-large; color:#000;">
<tr style="height: 150px">
<td class="barcode" colspan="9" align="center" scope="col" style="border: none">
<img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;"> 鈫�
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-large">
<span>{{this.item}}</span>
</div>
</td>
--
Gitblit v1.9.1