From 1b9886741c735b3ca0671adbe63ec86c408c521b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 29 十一月 2021 18:39:30 +0800
Subject: [PATCH] 设备维修记录修复

---
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html |   81 ++++++++++++++++++++--------------------
 1 files changed, 41 insertions(+), 40 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 01d5881..2e1b72c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -526,48 +526,49 @@
                         $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
                         $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
-                        var list = [];
-                        for (var i = 0; i < checkStatus.data.length; i++) {
-                            list.push(checkStatus.data[i].鍗曟嵁鍙�)
-                        }
-                        if (isAllEqual(list))  //鐩稿悓鍗曞彿
-                        {
-                            var rowdate = layui.table.cache["mainTable"];
-                            //琛ㄤ綋鏁版嵁涓虹┖鏃�
-                            if (rowdate.length == 0) {
-                                buttonArr = [];//娓呯┖鏁扮粍
-                                for (var i = 0; i < checkStatus.data.length; i++) {
-                                    var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
-                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                        //鎸夐�夊崟鍙峰姞杞借〃浣撴暟鎹�
+                        $.ajax({
+                            url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillSubByHMainSourceBillNo',
+                            type: "GET",
+                            data: { "HMainSourceBillNo": checkStatus.data[0].鍗曟嵁鍙� },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    var EndData = result.data;
+                                    var rowdate = layui.table.cache["mainTable"];
+                                    if (rowdate.length == 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                    {
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HSourceInterID": EndData[i].hmainid, "HSourceEntryID": EndData[i].hsubid, "HSourceBillNo": EndData[i].鍗曟嵁鍙�, "HSourceBillType": EndData[i].HBillType };
+                                            buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                        }
+                                        table.reload("mainTable", {
+                                            data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                        })
+                                    }
+                                    else {
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < EndData.length; i++) {
+                                            var checkrow = {
+                                                "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+                                                "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+                                                "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+                                                "HSourceInterID": EndData[i].hmainid, "HSourceEntryID": EndData[i].hsubid,
+                                                "HSourceBillNo": EndData[i].鍗曟嵁鍙�, "HSourceBillType": EndData[i].HBillType
+                                            };
+                                            buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                        }
+                                        table.reload("mainTable", {
+                                            data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                        })
+                                    }
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
                                 }
-                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
-                                table.reload("mainTable", {
-                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                })
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                             }
-                            else {
-                                buttonArr = [];//娓呯┖鏁扮粍
-                                for (var i = 0; i < rowdate.length; i++) {
-                                    var checkrow = {
-                                        "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
-                                        "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": checkStatus.data[0].HManagerID, "HManagerCode": checkStatus.data[i].璐熻矗浜轰唬鐮�,
-                                        "HManagerName": rowdate[i].璐熻矗浜�, "HRemark": rowdate[i].HRemark,
-                                        "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,
-                                        "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷
-                                    };
-                                    buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
-                                }
-                                buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
-                                table.reload("mainTable", {
-                                    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
-                                })
-                            }
-
-                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                        }
-                        else {
-                            layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
-                        }
+                        });
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {

--
Gitblit v1.9.1