From 10a60f0142e1bdd2630365d14217ef1246bf13f7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 10 二月 2026 10:18:21 +0800
Subject: [PATCH] 发货时间只能选择当前时间之后

---
 src/main/webapp/views/pla/sellout.html |   73 ++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/main/webapp/views/pla/sellout.html b/src/main/webapp/views/pla/sellout.html
index 0ad9bf3..68396ee 100644
--- a/src/main/webapp/views/pla/sellout.html
+++ b/src/main/webapp/views/pla/sellout.html
@@ -85,24 +85,12 @@
                 </div>
             </div>
         </div>
-
-        <div class="layui-form layui-card-header" >
-            <label class="layui-form-label"><span class="not-null">*</span>閫夋嫨鍙戣揣鏃堕棿锛�</label> </br>
-            <i class="layui-icon layui-icon-date" style="font-size: 30px; color: #3F3F3F;"></i>
-            <div class="layui-form-item">
-                <button id="btn-day1-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">浠婂ぉ涓嬪崍 80 鉁�</button>
-                <button id="btn-day2-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鏄庡ぉ涓嬪崍</button>
-                <button id="btn-day3-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button>
-                <button id="btn-day4-am" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button>
-            </div>
-            <div class="layui-form-item ">
-                <button id="btn-day1-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">浠婂ぉ涓嬪崍</button>
-                <button id="btn-day2-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鏄庡ぉ涓嬪崍</button>
-                <button id="btn-day3-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button>
-                <button id="btn-day4-pm" type="button" class="delivery layui-btn layui-btn-radius layui-btn-primary">鍚庡ぉ涓嬪崍</button>
+        <div class="layui-inline"  style="width:83%; margin-bottom: 5px;">
+            <label class="layui-form-label"><span class="not-null">*</span>鍙戣揣鏃堕棿锛�</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" id="pakoutTime">
             </div>
         </div>
-
         <div id="data-detail-btn" class="layui-btn-container layui-form-item">
             <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
             <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
@@ -139,16 +127,18 @@
         }
     });
 
+    var firstData = [];
     var checkData = [];
     var detailData = [];
     var deliveryTime;
     function child(data){
         checkData = data;
-        var allWeight = 0;
-        for (var i in checkData){
-            allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
-        }
-        $('#qtyWeight').val(allWeight);
+        firstData = data;
+        // var allWeight = 0;
+        // for (var i in checkData){
+        //     allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
+        // }
+        // $('#qtyWeight').val(allWeight);
         delivery();
 
     }
@@ -201,6 +191,12 @@
         var form = layui.form;
         var layer = layui.layer;
         var table = layui.table;
+        var laydate = layui.laydate;
+        // 鏃ユ湡鏃堕棿閫夋嫨鍣�
+        laydate.render({
+            elem: '#pakoutTime',
+            type: 'datetime'
+        });
 
         form.on('submit(edit)', function () {
             var dataList = [];
@@ -242,25 +238,33 @@
         // 鏁版嵁鎻愪氦鍔ㄤ綔
         form.on('submit(save)', function () {
 
-            if($('#maktxV').val() != checkData[0].brand){
-                layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟");
+            // if($('#maktxV').val() != checkData[0].brand){
+            //     layer.msg("閫変腑鐨勫簱瀛樼墝鍙蜂笌璁㈠崟鐗屽彿涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨璁㈠崟");
+            //     return;
+            // }
+            if ($('#qtyWeight').val() === '0') {
+                layer.msg("鍙戣揣閲嶉噺涓嶈兘涓�0");
+                return;
+            }
+            if(!$('#pakoutTime').val()){
+                layer.msg("璇烽�夋嫨鍙戣揣鏃堕棿");
                 return;
             }
 
+            if (isOver15Seconds($('#pakoutTime').val())) {
+                // console.log('鍙戣揣鏃堕棿瓒呮椂锛岃閲嶆柊閫夋嫨');
+                layer.msg("鍙戣揣鏃堕棿瓒呮椂锛岃閲嶆柊閫夋嫨");
+                return;
+            }
             for (var i in checkData){
                 checkData[i].orderNo = $('#orderNoV').val();
                 checkData[i].customer = $('#customer').val();
                 checkData[i].phone = $('#phone').val();
                 checkData[i].addr = $('#addr').val();
-                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme;
+                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme - checkData[i].qtyAnfme;
                 checkData[i].allocate = $('#allocate').val();
                 checkData[i].memo = $('#memo').val();
-                checkData[i].pakoutTime = deliveryTime;
-            }
-
-            if(!deliveryTime){
-                layer.msg("璇烽�夋嫨鍙戣揣鏃堕棿");
-                return;
+                checkData[i].pakoutTime = $('#pakoutTime').val();
             }
 
             $.ajax({
@@ -273,8 +277,8 @@
                 success: function (res) {
                     if (res.code === 200){
                         layer.msg("淇敼鎴愬姛");
-                        tableReload(true);
-                        parent.clearTable();
+                        // tableReload(true);
+                        parent.clearTable($('#maktxV').val());
                     } else if (res.code === 403){
                         layer.msg(res.msg, {icon: 2})
                         return;
@@ -286,7 +290,10 @@
                 }
             })
         });
-
+        function isOver15Seconds(timeStr) {
+            var t = new Date(timeStr.replace(/-/g, '/')).getTime();
+            return t + 15 * 1000 <= Date.now();
+        }
         form.on('submit(detailEditSubmit)', function () {
 
             detailData = table.cache.detailTable;

--
Gitblit v1.9.1