From 1abd12ed1c9e3be2f47fda19e86baa99e02bca1b Mon Sep 17 00:00:00 2001
From: zhangrg <z18737863051@163.com>
Date: 星期四, 28 十二月 2023 17:45:09 +0800
Subject: [PATCH] 优化检测值,检验方法,检验依据的禁用和组织带不过来

---
 WebTM/views/系统管理/用户管理/Xt_UserSuplies_Excel.html            |  231 ++++++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectMethod.html     |   60 +-
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadResult.html         |   60 +-
 WebTM/views/系统管理/用户管理/Xt_UserSuplies.html                  |   23 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectValue.html      |   61 +-
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html |   60 +-
 WebTM/views/系统管理/用户管理/Gy_UserProcess_Excel.html            |  259 +++++++++++++
 WebTM/views/系统管理/用户管理/Gy_UserEmployee_Excel.html           |  259 +++++++++++++
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectBasis.html      |   12 
 WebTM/WebTM.csproj                                         |    3 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_QualityStd.html        |   60 +-
 11 files changed, 903 insertions(+), 185 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9d508d0..634a5a4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -333,6 +333,9 @@
     <Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
     <Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
     <Content Include="views\绯荤粺绠$悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserEmployee_Excel.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserProcess_Excel.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserSuplies_Excel.html" />
     <Content Include="views\绯荤粺绠$悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
     <Content Include="views\璁″垝绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
     <Content Include="views\璁″垝绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
index 9b8fd65..7ff00a9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectBasis.html"
@@ -236,7 +236,7 @@
                             $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
                         } else {
@@ -247,15 +247,7 @@
                     }
                 });
             }
-            //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-              
-                return true;
-            }
+           
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
index 92e087c..0bee5b7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
@@ -149,32 +149,30 @@
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_InspectInstruMentList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_InspectInstruMentList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
@@ -236,7 +234,7 @@
                             $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
                         } else {
@@ -247,15 +245,7 @@
                     }
                 });
             }
-            //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-              
-                return true;
-            }
+            
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectMethod.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectMethod.html"
index c6283b3..8568e60 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectMethod.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectMethod.html"
@@ -149,32 +149,30 @@
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_InspectMethodList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_InspectMethodList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
@@ -236,7 +234,7 @@
                             $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
                         } else {
@@ -247,15 +245,7 @@
                     }
                 });
             }
-            //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-              
-                return true;
-            }
+           
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectValue.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectValue.html"
index 05923e2..389629e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectValue.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectValue.html"
@@ -149,32 +149,30 @@
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_InspectValueList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_InspectValueList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
@@ -233,10 +231,10 @@
                             $("#HNumber").val(data.妫�娴嬪�间唬鐮�);//浠g爜
                             $("#HName").val(data.妫�娴嬪�煎悕绉�);//鍚嶇О
                             $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
-                            $("#HUSEORGID").val(data.浣跨敤缁勭粐);//浣跨敤缁勭粐
+                            $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
                         } else {
@@ -248,14 +246,7 @@
                 });
             }
             //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-              
-                return true;
-            }
+            
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QualityStd.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QualityStd.html"
index 412685c..79f220b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QualityStd.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QualityStd.html"
@@ -149,32 +149,30 @@
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_QualityStdList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_QualityStdList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
@@ -236,7 +234,7 @@
                             $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
                         } else {
@@ -247,15 +245,7 @@
                     }
                 });
             }
-            //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-              
-                return true;
-            }
+          
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadResult.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadResult.html"
index 63c1c18..678303e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadResult.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadResult.html"
@@ -158,32 +158,30 @@
                 isBeginCheck == true ? data.field.HISsystemSet = 'true' : data.field.HISsystemSet = 'false';
 
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "SaveGy_BadResultList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "msg": sMainStr },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { icon: 1 });
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                }
-                                else {
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_BadResultList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
-                        });
-                }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
@@ -245,7 +243,7 @@
                             $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
-                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
                             $("input[name='HISsystemSet']").attr("checked", data.鏄惁绯荤粺棰勮);//true:閫変腑 false:涓嶉�変腑
                             layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
 
@@ -257,15 +255,7 @@
                     }
                 });
             }
-            //鏁版嵁楠岃瘉
-            function AllowLoadData() {
-                if ($("#HHelpCode").val() == '') {
-                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-               
-                return true;
-            }
+          
             //
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html"
new file mode 100644
index 0000000..1462944
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserEmployee_Excel.html"
@@ -0,0 +1,259 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢ㄦ埛鍏宠仈鑱屽憳淇℃伅瀵煎叆</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , upload = layui.upload
+
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            //data: {
+            //    "WorkBookName": function () {
+            //        return $("#WorkBookName").val();
+            //    },
+            //    "HOrgID": function () {
+            //        return sessionStorage["OrganizationID"];
+            //    }
+            //},
+            //before: function (data) {
+            //    loadIndex = layer.load(2);
+            //    this.data = {
+            //        "WorkBookName": $("#WorkBookName").val(),
+            //        "HOrgID": sessionStorage["OrganizationID"]
+
+            //    }
+            //},
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                } else {
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+        //#endregion
+
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜', width: 120 }
+                    , { field: '缁勭粐', title: '缁勭粐', width: 120 }
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被', width: 120 }
+                    , {field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: '鎷夊姩瀹夊叏搴撳瓨閲�', width: 120 }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: '鐗╂枡闇�姹備緵璐у懆鏈�', width: 120 }
+                    , { field: 'JIT鎻愯揣缁忔祹鎵归噺', title: 'JIT鎻愯揣缁忔祹鎵归噺', width: 120 }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', width: 120 }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', width: 120 }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', width: 120 }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟', width: 120 }
+                    , { field: 'JIT鏈�灏忚捣閫侀噺', title: 'JIT鏈�灏忚捣閫侀噺', width: 120 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+            //DisPlay_HideColumn();
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        var oldData = option.data;
+                        oldData.splice(obj.tr.data('index'), 1)
+                        option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+            var num = [];
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i] != "") {
+                    num.push(option.data[i])
+                }
+            }
+
+            //data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+            //var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg(data.Message);
+                        option.data = null;
+                        table.cache["mainTable"] = null;
+                        table.render(option);
+                    }
+                    else {
+                        layer.close(index);
+                        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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html"
new file mode 100644
index 0000000..5b20bb8
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserProcess_Excel.html"
@@ -0,0 +1,259 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢ㄦ埛鍏宠仈宸ュ簭淇℃伅瀵煎叆</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , upload = layui.upload
+
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+            //data: {
+            //    "WorkBookName": function () {
+            //        return $("#WorkBookName").val();
+            //    },
+            //    "HOrgID": function () {
+            //        return sessionStorage["OrganizationID"];
+            //    }
+            //},
+            //before: function (data) {
+            //    loadIndex = layer.load(2);
+            //    this.data = {
+            //        "WorkBookName": $("#WorkBookName").val(),
+            //        "HOrgID": sessionStorage["OrganizationID"]
+
+            //    }
+            //},
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                } else {
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+        //#endregion
+
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '缁勭粐缂栫爜', title: '缁勭粐缂栫爜', width: 120 }
+                    , { field: '缁勭粐', title: '缁勭粐', width: 120 }
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'JIT鐗╂枡鍒嗙被', title: 'JIT鐗╂枡鍒嗙被', width: 120 }
+                    , {field: 'JIT鎷夊姩瀹夊叏搴撳瓨閲�', title: '鎷夊姩瀹夊叏搴撳瓨閲�', width: 120 }
+                    , { field: 'JIT鐗╂枡闇�姹備緵璐у懆鏈�', title: '鐗╂枡闇�姹備緵璐у懆鏈�', width: 120 }
+                    , { field: 'JIT鎻愯揣缁忔祹鎵归噺', title: 'JIT鎻愯揣缁忔祹鎵归噺', width: 120 }
+                    , { field: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', title: 'JIT鎻愯揣鎵归噺瀵瑰簲鍛ㄦ湡锛堝ぉ锛�', width: 120 }
+                    , { field: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', title: 'JIT渚涜揣鎻愬墠鏈燂紙澶╋級', width: 120 }
+                    , { field: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', title: 'JIT鍒拌揣鍓嶇疆鏈燂紙澶╋級', width: 120 }
+                    , { field: 'JIT閫佽揣鎺у埗澶╂暟', title: 'JIT閫佽揣鎺у埗澶╂暟', width: 120 }
+                    , { field: 'JIT鏈�灏忚捣閫侀噺', title: 'JIT鏈�灏忚捣閫侀噺', width: 120 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+            //DisPlay_HideColumn();
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        var oldData = option.data;
+                        oldData.splice(obj.tr.data('index'), 1)
+                        option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+            var num = [];
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i] != "") {
+                    num.push(option.data[i])
+                }
+            }
+
+            //data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+            //var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg(data.Message);
+                        option.data = null;
+                        table.cache["mainTable"] = null;
+                        table.render(option);
+                    }
+                    else {
+                        layer.close(index);
+                        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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index c1b83bb..8455079 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -44,6 +44,7 @@
                             <div class="layui-btn-group">
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Excel">Excel瀵煎叆</button>
                             </div>
                         </div>
                         <div class="layui-card-body">
@@ -213,6 +214,7 @@
                 });
             });
 
+          
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -331,6 +333,11 @@
                 }
             });
 
+            //瀵煎叆
+            form.on('submit(set_Excel)', function () {
+                set_Excel();
+            });
+
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -363,6 +370,22 @@
                 table.render(option);
             }
 
+            //瀵煎叆
+            function set_Excel() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢ㄦ埛鍏宠仈渚涘簲鍟嗕俊鎭垪琛�-瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢ㄦ埛绠$悊/Xt_UserSuplies_Excel.html'
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        set_InitGrid();
+                    }
+                })
+            }
+
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
                 var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html"
new file mode 100644
index 0000000..025aa7b
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies_Excel.html"
@@ -0,0 +1,231 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢ㄦ埛鍏宠仈渚涘簲鍟嗕俊鎭鍏�</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+        //#region 鍏敤鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+            , laydate = layui.laydate
+            , util = layui.util
+            , tree = layui.tree
+            , util = layui.util
+            , upload = layui.upload
+
+
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //鏂囦欢涓婁紶
+        upload.render({
+            elem: '#UpLoad',
+            url: GetWEBURL() + '/Xt_User/UserSupperBill_Excel',
+            contentType: 'application/json',
+            exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+
+
+            done: function (data1) {
+                if (data1.count == 1) {
+                    option.data = data1.data;
+                    table.render(option);
+                } else {
+                    layer.alert(data1.code + data1.Message, { icon: 5 });
+                }
+            },
+            error: function (err) {
+                debugger
+                layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //瀵煎叆  淇濆瓨鏁版嵁
+        form.on('submit(btnSave)', function (data) {
+            if (table.cache["mainTable"] != null) {
+                set_AddNew(data);
+            }
+            else {
+                layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+            }
+        })
+
+        //閫�鍑�
+        form.on('submit(Cancel)', function () {
+            Pub_Close(1);
+        })
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+        }
+        //#endregion
+
+
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , limit: 50
+                , limits: [50, 500, 5000, 20000]
+                , loading: false
+                , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: '鐢ㄦ埛浠g爜', title: '鐢ㄦ埛浠g爜', width: 120 }
+                    , { field: '鐢ㄦ埛鍚嶇О', title: '鐢ㄦ埛鍚嶇О', width: 120 }
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            };
+
+            //娓叉煋椤甸潰
+            table.render(option);
+            //DisPlay_HideColumn();
+        }
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    console.log("绱㈠紩涓�:" + rowIndex);
+                    if (rowIndex === '0') {
+                        layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                    } else {
+                        var oldData = option.data;
+                        oldData.splice(obj.tr.data('index'), 1)
+                        option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+
+        //瀵煎叆(淇濆瓨)
+        function set_AddNew(data) {
+            var num = [];
+            for (var i = 0; i < option.data.length; i++) {
+                if (option.data[i] != "") {
+                    num.push(option.data[i])
+                }
+            }
+
+            //data.field.HOrgID = sessionStorage["OrganizationID"];//缁勭粐
+            //var sMainStr = JSON.stringify(data.field);
+            var sSubStr = JSON.stringify(num);
+            var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+            var index = layer.load();
+
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
+                async: true,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data) {
+                    if (data.count == 1) {
+                        layer.close(index);
+                        layer.msg(data.Message);
+                        option.data = null;
+                        table.cache["mainTable"] = null;
+                        table.render(option);
+                    }
+                    else {
+                        layer.close(index);
+                        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: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //#endregion
+
+    });
+
+</script>
\ No newline at end of file

--
Gitblit v1.9.1