From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/mat/mat.html | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index cfe2b54..933ceb3 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -286,11 +286,16 @@
<input name="supp" placeholder="璇疯緭鍏ュ缓妗ｄ汉" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂枡棰戠巼</label>
+ <div class="layui-input-block">
+ <input name="beBatch" type="number" placeholder="1涓洪珮棰戯紝鍏朵粬鍧囦负浣庨" class="layui-input">
</div>
</div>
@@ -310,17 +315,17 @@
<hr>
<!--鍗曢�夋-->
<div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
- <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
- <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
- <input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
- <input type="radio" name="selectTemplate" value="4" title="妯℃澘鍥�" lay-filter="selectTemplateRadio">
+<!-- <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">-->
+<!-- <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">-->
+<!-- <input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">-->
+ <input type="radio" name="selectTemplate" value="4" title="妯℃澘鍥�" lay-filter="selectTemplateRadio" checked="checked">
</div>
<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">
+ <div id="template-preview-1" class="template-preview" style="display: none">
<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>
@@ -383,7 +388,7 @@
</div>
<!-- 棰勮鍥� 4 -->
- <div id="template-preview-4" class="template-preview" style="display: none">
+ <div id="template-preview-4" 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: 37px">
<td align="center" scope="col" >鍟嗗搧</td>
--
Gitblit v1.9.1