From 89b2a1e44a4c4a244eb885c5f8dd802147dd03ee Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期五, 02 二月 2024 11:18:26 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/ASNSetting/LabelPrintSelect.html | 148 ++++++++++++++++++++++++++++++------------------
1 files changed, 92 insertions(+), 56 deletions(-)
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 31beeec..1b021e4 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -10,6 +10,25 @@
</head>
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢熶骇鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="text" name="productionTime" id="productionTime" placeholder="璇疯緭鍏ョ敓浜ф棩鏈�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏈夋晥鏈熻嚦</label>
+ <div class="layui-input-block">
+ <input type="text" name="expirationTime" id="expirationTime" placeholder="璇疯緭鍏ユ湁鏁堟湡鑷�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍌ㄥ瓨鏈熻嚦</label>
+ <div class="layui-input-block">
+ <input type="text" name="storeTime" id="storeTime" placeholder="璇疯緭鍏ュ偍瀛樻湡鑷�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">閲嶇疆鎵瑰彿</label>
<div class="layui-input-block">
@@ -19,7 +38,7 @@
</select>
</div>
</div>
- <div class="layui-form-item">
+ <!-- <div class="layui-form-item">
<label class="layui-form-label">鏍囩绾у埆</label>
<div class="layui-input-block">
<select name="level" id="level" lay-filter="levelFil" lay-verify="required">
@@ -36,14 +55,16 @@
<option value="0">鏃犲眰绾�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-form-item">
<label class="layui-form-label">鍒拌揣鏁伴噺</label>
<div class="layui-input-block">
- <input type="text" name=arriveQty" id="arriveQty" lay-verify="required" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ <input type="text" name="arriveQty" id="arriveQty" lay-verify="required" placeholder="璇疯緭鍏ュ埌璐ф暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
- <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
+
+ <!-- <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
<label class="layui-form-label">绠辨敮绫诲瀷</label>
<div class="layui-input-block">
<select name="boxType" id="boxType" lay-filter="boxTypeFil" lay-search>
@@ -56,9 +77,10 @@
<div class="layui-form-item" id="qtyDiv" style="display: none;">
<label class="layui-form-label">鏁伴噺</label>
<div class="layui-input-block">
- <input type="text" name="qty" id="qty" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ <input type="text" name="qty" id="qty" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" class="layui-input" oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
- </div>
+ </div> -->
<div class="layui-form-item layui-hide">
<input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
<input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="纭缂栬緫">
@@ -75,64 +97,78 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'layer'], function() {
+ }).use(['index', 'form', 'layer', 'laydate'], function() {
var $ = layui.$;
var form = layui.form;
var layer = layui.layer;
- form.on('select(levelFil)', function(data){
- console.log($("#type").val());
- var type = $("#type").val();
- if (data.value == "1" ) {
- $("#boxTypeDiv").css("display","none");
- form.val("layuiadmin-app-form-list", {
- "boxType": ""
- });
- $("#boxType").removeAttr("lay-verify");
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#productionTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#expirationTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#storeTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
+ // form.on('select(levelFil)', function(data){
+ // console.log($("#type").val());
+ // var type = $("#type").val();
+ // if (data.value == "1" ) {
+ // $("#boxTypeDiv").css("display","none");
+ // form.val("layuiadmin-app-form-list", {
+ // "boxType": ""
+ // });
+ // $("#boxType").removeAttr("lay-verify");
- form.render('select');
- }
- if (data.value == "2" && type == "0") {
- $("#boxTypeDiv").css("display","block");
- $("#boxType").attr("lay-verify","required");
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+
+ // form.render('select');
+ // }
+ // if (data.value == "2" && type == "0") {
+ // $("#boxTypeDiv").css("display","block");
+ // $("#boxType").attr("lay-verify","required");
- }
- });
- form.on('select(typeFil)', function(data){
- var level = $("#level").val();
- if (data.value == "1") {
- $("#boxTypeDiv").css("display","none");
+ // }
+ // });
+ // form.on('select(typeFil)', function(data){
+ // var level = $("#level").val();
+ // if (data.value == "1") {
+ // $("#boxTypeDiv").css("display","none");
- form.val("layuiadmin-app-form-list", {
- "boxType": ""
- });
- $("#boxType").removeAttr("lay-verify");
-
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
- form.render('select');
- }
- if (data.value == "0" && level == "2") {
- $("#boxTypeDiv").css("display","block");
- $("#boxType").attr("lay-verify","required");
+ // form.val("layuiadmin-app-form-list", {
+ // "boxType": ""
+ // });
+ // $("#boxType").removeAttr("lay-verify");
- }
- });
- form.on('select(boxTypeFil)', function(data){
- if (data.value == "1") { //绠�
- $("#qtyDiv").css("display","none");
- $("#qty").removeAttr("lay-verify");
- $("#qty").val("");
- }
- if (data.value == "2" ) {
- $("#qtyDiv").css("display","block");
- $("#qty").attr("lay-verify","required");
- }
- });
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+ // form.render('select');
+ // }
+ // if (data.value == "0" && level == "2") {
+ // $("#boxTypeDiv").css("display","block");
+ // $("#boxType").attr("lay-verify","required");
+
+ // }
+ // });
+ // form.on('select(boxTypeFil)', function(data){
+ // if (data.value == "1") { //绠�
+ // $("#qtyDiv").css("display","none");
+ // $("#qty").removeAttr("lay-verify");
+ // $("#qty").val("");
+ // }
+ // if (data.value == "2" ) {
+ // $("#qtyDiv").css("display","block");
+ // $("#qty").attr("lay-verify","required");
+ // }
+ // });
})
--
Gitblit v1.8.0