From 1401f0156b5338a110f1d3a803a3c09c134b7e0d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 23 三月 2024 16:53:02 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/SOSetting/ExportAllot.html | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 7651448..24dfb71 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -217,7 +217,13 @@
}}
{{ GetBtn7(d) }}
</script>
-
+ <script type="text/html" id="templetUpdateTime">
+ {{# function GetBtn71(d){
+ return formatDate(d.UpdateTime);
+ }
+ }}
+ {{ GetBtn71(d) }}
+ </script>
<script type="text/html" id="templetUnstackingMode">
{{# function GetBtn8(d){
switch (d.UnstackingMode) {
@@ -278,7 +284,7 @@
<script type="text/html" id="table-content-list2">
{{# function GetBtn2(d){
var html = '';
- if(d.SkuNo != "100099"){
+ if(d.SkuNo != "100099" && d.BoxNo != ''){
html =`<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sel">
<i class="layui-icon layui-icon-edit"></i>璇︽儏</a>`;
}
@@ -347,6 +353,7 @@
{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
{ field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 160, templet: '#templetCreateTime' },
+ { field: 'UpdateTime', align: 'center', title: '瀹屾垚鏃堕棿', width: 160, templet: '#templetUpdateTime' },
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -608,7 +615,7 @@
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 110, },
{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 120, },
- //{field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 165,templet: '#templetCreateTime2'},
+ //{field: 'CreateTime',align: 'center',title: '鎷ｈ揣鏃堕棿',width: 165,templet: '#templetCreateTime2'},
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -829,25 +836,33 @@
console.log(obj);
if (obj.event === 'del') {
layer.confirm('纭畾鎾ら攢閫変腑鐨勫垎閰嶄俊鎭悧锛�', function (index) {
- var param = {
- Id: parseInt(obj.data.Id)
- };
- sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
+ if (doing) {
+ doing = false;
+
+ var param = {
+ Id: parseInt(obj.data.Id)
+ };
+ sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ doing = true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ doing = true;
+ });
+ }
+ });
+ }
+
});
}
});
--
Gitblit v1.8.0