From fe50d723e5d050113c4ecc493220e264f39d8e5f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 02 七月 2025 17:00:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index fc1ea34..85ded7c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -121,20 +121,25 @@
             contentType: 'application/json',
             exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
             before: function (data) {
-                loadIndex = layer.load(2);
+                layer.load();
             },
             done: function (data1) {
+                layer.closeAll('loading');
                 if (data1.count == 1) {
+                    var HVersion_Import_Temp = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
+                    for (var i = 0; i < data1.data.length; i++) {
+                        data1.data[i].HVersion_Import = HVersion_Import_Temp;
+                    }
+
                     option.data = data1.data;
                     table.render(option);
-                    layer.close(loadIndex);
                 } else {
-                    layer.close(loadIndex);
                     layer.alert(data1.code + data1.Message, { icon: 5 });
                 }
             },
             error: function (err) {
                 debugger
+                layer.closeAll('loading');
                 layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
             }
         });
@@ -212,6 +217,7 @@
             columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
             columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
             columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+            columns.push({ field: 'HVersion_Import', title: '瀵煎叆搴忓垪鍙�'});
 
             var k = 0;//鏀堕泦寰幆娆℃暟
             var Days = 45;
@@ -260,6 +266,7 @@
 
         //瀵煎叆(淇濆瓨)
         function set_AddNew(data) {
+            var msgError = "";
 
             var num = [];
             for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -319,19 +326,27 @@
                     success: function (data) {
                         if (data.count == 1) {
                             layer.close(index);
-                            layer.msg("鎻愪氦鎴愬姛");
+                           /* layer.msg("鎻愪氦鎴愬姛");*/
                         }
                         else {
                             layer.close(index);
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            msgError += data.Message + "锛�";
+                            //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     },
                     error: function (err) {
                         layer.close(index);
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        msgError += err + "锛�";
+                        //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
-            }            
+            }
+
+            if (msgError.length == 0) {
+                layer.msg("鎻愪氦鎴愬姛");
+            } else {
+                layer.msg(msgError, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            }
         }
 
         //琛屽唴鍒犻櫎

--
Gitblit v1.9.1