From 47617b6de6cf73760d0ffc4fdb21cd5c4f877430 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 29 七月 2024 09:32:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html |   99 +++++++++++++++++++++++++------------------------
 1 files changed, 51 insertions(+), 48 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 588776d..2a87db1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -970,56 +970,59 @@
         }
 
         function save(data) {
+            var index = layer.load();
+            var sMainStr = JSON.stringify(data.field);
+            var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+            if (!AllowLoadData())//鏁版嵁楠岃瘉
+            {
+                return false;
+            }
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: false,
+                data: { "msg": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                        layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                            //layer.close(layer.index);
+                            //window.parent.location.reload();
+                            if (data.Verify == "Y") //鑷姩瀹℃牳
+                            {
+                                layer.close(index);
+                                SaveVerify(); //瀹℃牳
+                            }
+                            else {
+                                layer.close(index);
+                            }
+                        });
+                        layer.close(index);
 
-                  var sMainStr = JSON.stringify(data.field);
-                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
-                if (!AllowLoadData())//鏁版嵁楠岃瘉
-                {
-                    return false;
-                }
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: false,
-                    data: { "msg": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                //layer.close(layer.index);
-                                //window.parent.location.reload();
-                                if (data.Verify == "Y") //鑷姩瀹℃牳
-                                {
-                                    layer.close(index);
-                                    SaveVerify(); //瀹℃牳
-                                }
-                                else {
-                                    layer.close(index);
-                                }
-                            });
-                           
-                            //layer.confirm(data.Message, {
-                            //    btn: ['纭']
-                            //}, function (index) {
-                            //        if (data.Verify == "Y") //鑷姩瀹℃牳
-                            //        {
-                            //            layer.close(index);
-                            //            SaveVerify(); //瀹℃牳
-                            //        }
-                            //        else {
-                            //            layer.close(index);
-                            //        }
-                            //});
-                        }
-                        else {
-                            layer.alert(data.Message, { icon: 5 })
-                        }
-                    },
-                    error: function (err) {
-                        layer.alert(err, { icon: 5 })
+                        //layer.confirm(data.Message, {
+                        //    btn: ['纭']
+                        //}, function (index) {
+                        //        if (data.Verify == "Y") //鑷姩瀹℃牳
+                        //        {
+                        //            layer.close(index);
+                        //            SaveVerify(); //瀹℃牳
+                        //        }
+                        //        else {
+                        //            layer.close(index);
+                        //        }
+                        //});
                     }
-                })
+                    else {
+                        layer.alert(data.Message, { icon: 5 })
+                        layer.close(index);
+                    }
+                },
+                error: function (err) {
+                    layer.alert(err, { icon: 5 })
+                    layer.close(index);
+                }
+            })
         }
 
         function formatDate(date) {

--
Gitblit v1.9.1