From 158b60ecf8663cf3ec2a33c2b141cd51200b3d5e Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 07 一月 2025 14:48:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/设备管理/设备开机单/Sb_EquipBeginBill.html               |   36 
 WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html            |   11 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html         |   14 
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBillList.html            |   14 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html |   15 
 WebTM/views/生产管理/订单状态分布/Sc_EquipmentProcessList.html        |  353 +++
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html         |   33 
 WebTM/views/设备管理/设备开机单/Sb_EquipBeginBillList.html           |   14 
 WebTM/views/质量管理/安灯逐级呼叫规则/OA_AndengFlowRuleBillMain.html    |    2 
 WebTM/layuiadmin/layui/css/ReportPlatform.css               |    5 
 WebTM/views/生产管理/订单状态分布/Sc_OEEStatusReport.html             |  487 ++++
 WebTM/views/设备管理/Sb_EqpConkBookBillList.html                |    4 
 WebTM/WebTM.csproj.user                                     |    2 
 WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBillList.html      | 1181 ++++++++++++
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBill.html                |   33 
 WebTM/views/车间管理/启动点检单/Sc_WorkDotCheckBillList_Day.html     |    8 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html             |   46 
 WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html         |   14 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html      |   16 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html         |   21 
 WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBill_Add_Edit.html | 1091 +++++++++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html       |   14 
 WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html     |  629 ++++++
 WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html            |  142 
 WebTM/layuiadmin/SetColumn.js                               |  138 +
 WebTM/views/项目管理/工程项目/PM_ProjectBillList.html               |   43 
 WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html      | 1466 +++++++++-----
 WebTM/views/设备管理/设备报表/Sb_EquipResumeCheckQuery.html         |   23 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html          |   18 
 WebTM/WebTM.csproj                                          |    6 
 30 files changed, 5,179 insertions(+), 700 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cee3353..4714024 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -538,6 +538,8 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
@@ -546,6 +548,8 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_TK.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
+    <Content Include="views\鐢熶骇绠$悊\璁㈠崟鐘舵�佸垎甯僜Sc_EquipmentProcessList.html" />
+    <Content Include="views\鐢熶骇绠$悊\璁㈠崟鐘舵�佸垎甯僜Sc_OEEStatusReport.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
     <Content Include="views\鐪嬫澘\閲囪喘鏀舵枡\KB_CGSL.html" />
@@ -667,6 +671,7 @@
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill.html" />
     <Content Include="views\璁惧绠$悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList.html" />
     <Content Include="views\璐ㄩ噺绠$悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBill_PDA.html" />
+    <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Sc_WorkDotCheckBillList_Day.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_Sup.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_CenterCheckBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_CenterCheckBillList.html" />
@@ -2167,6 +2172,7 @@
     <Content Include="views\椤圭洰绠$悊\鍩虹寤烘ā\Gy_TaskClass.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
+    <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedCheckQuery.html" />
     <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
     <Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8233a56..8f1260e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 2c354f5..7000cd1 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -183,3 +183,141 @@
     })
 }
 //#endregion
+
+//#region 闅愯棌鍒楄缃紪杈戦〉闈�
+function get_HideColumnEdit(HModName,user,option,table) {
+    var colName = "";
+    for (var i = 1; i < option.cols[0].length - 1; i++) {
+        colName += option.cols[0][i]["field"] + ",";
+    }
+    var colTitleName = "";
+    for (var i = 1; i < option.cols[0].length - 1; i++) {
+        colTitleName += option.cols[0][i]["title"] + ",";
+    }
+    colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+    layer.open({
+        type: 2
+        , skin: "layui-layer-rim" //鍔犱笂杈规
+        , title: "闅愯棌鍒楄缃�"  //鏍囬
+        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+        , shift: 2 //寮瑰嚭鍔ㄧ敾
+        , area: ["50%", "90%"] //绐椾綋澶у皬
+        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+        , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+        , btn: ["纭畾", "鍙栨秷"]
+        , btn1: function (index, laero) {
+            //鍒锋柊琛ㄦ牸鏁版嵁
+            DisPlay_HideColumnEdit(HModName, user, option,table);
+            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            layer.close(index);//鍏抽棴寮圭獥
+        }
+    })
+}
+//#endregion
+
+//#region 鏄剧ず鍒楁暟鎹紪杈戦〉闈� 
+function DisPlay_HideColumnEdit(HModName, user, option,table) {
+    $.ajax({
+        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+        type: "GET",
+        async: false,
+        data: { "HModName": HModName, "user": user },
+        success: function (data1) {
+            if (data1.data.length != 0) {
+                var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                var titleData = [];
+                var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                dataCol = data1.data[0].HGridString.split(',');
+                //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�(鍘绘帀checkbox鍒楀拰鎿嶄綔鍒�)
+                if (dataCol.length == option.cols[0].length - 2) {
+                    //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                    for (var j = 0; j < option.cols[0].length - 2; j++) {
+                        for (var i = 0; i < option.cols[0].length - 2; i++) {
+                            var dataCols = dataCol[j].split('|');
+                            //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                            if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    option.cols[0][i + 1]["totalRow"] = true;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                                newCols[0].push(option.cols[0][i + 1]);
+                            }
+                        }
+                    }
+                    //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                    if (dataCol.length == newCols[0].length - 1) {
+                        newCols[0].push(option.cols[0][dataCol.length+1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
+                        option.cols = newCols;
+                        //鍙栨秷鍐荤粨鍒�
+                        for (var i = 1; i < option.cols[0].length - 1; i++) {
+                            if (option.cols[0][i]["fixed"] != null) {
+                                option.cols[0][i]["fixed"] = null;
+                            }
+                            else {
+                                break;
+                            }
+                        }
+                        //鍐荤粨鍒�
+                        if (data1.data[0].HFixCols != 0) {
+                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                    data1.data[0].HFixCols += 1;
+                                }
+                                option.cols[0][i + 1]["fixed"] = "left";
+                            }
+                        }
+                        //璁剧疆鍒楁帓搴�
+                        for (var i = 1; i < option.cols[0].length-1; i++) {
+                            if (data1.data[0].HSortFlag == "鏄�") {
+                                option.cols[0][i]["sort"] = true;
+                            }
+                            else {
+                                option.cols[0][i]["sort"] = false;
+                            }
+                        }
+                    }
+                }
+                table.render(option);
+            } else {
+            }
+        }, error: function () {
+            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+        }
+    })
+}
+//#endregion
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index ed1e8a9..ba98113 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -138,6 +138,11 @@
     border: 0.4em solid #B0C4DE;
     background-color: #B0C4DE;
 }
+/*闈掕壊*/
+.color_border7 {
+    border: 0.4em solid #B0C4DE;
+    background-color: #00FFFF;
+}
 .gj_icon {
     border-radius: 0.4em;
     width: 1px;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 0c6e010..27d7dbe 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -150,7 +150,12 @@
         var params = getUrlVars();
         var HModName = params[params[0]]; //妯″潡鍚嶇О
         var colName = params[params[1]]; //鍒楀悕
+        var colTitleName = params[params[2]]; //鍒楀埆鍚�
+        if (colTitleName == undefined) {
+            colTitleName = "";
+        }
         colName = decodeURI(colName);//瀵筓RI 杩涜瑙g爜
+        colTitleName = decodeURI(colTitleName);
         //鍒濆鍖栫晫闈�
         set_ClearBill();
 
@@ -341,7 +346,7 @@
                         for (var i = 0; i < colNames.length; i++) {
                             var dataCols = dataCol[i].split('|');
                             var ColumnName_Other = dataCols[4] == dataCols[5] ? "" : dataCols[4];
-                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "ColumnName_real": dataCols[5], "IsTotalRow": dataCols[6] == 1 ? true : false })
+                            cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3], "ColumnName_Other": ColumnName_Other, "IsTotalRow": dataCols[6] == 1 ? true : false })
                         }
                         option.data = cols;
                         table.render(option);
@@ -361,9 +366,10 @@
                         form.render('select');
                         layer.close(ajaxLoad);
                     } else {
+                        var colTitleNames = colTitleName.split(',');
                         //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏  琛ㄦ牸鐨勬暟鎹~鍏�
                         for (var i = 0; i < colNames.length; i++) {
-                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "IsTotalRow": false })
+                            cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120, "ColumnName_Other": colTitleNames[i], "IsTotalRow": false })
                         }
                         option.data = cols;
                         table.render(option);
@@ -401,7 +407,6 @@
                     , { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
                     , { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text' }
                     , { field: 'ColumnName_Other', title: '鍒悕', width: 120, edit: 'text' }
-                    , { field: 'ColumnName_real', title: '鍒悕瀵瑰簲鍒楀悕', width: 120, edit: 'text', hide: "true" }
                     , { field: 'IsTotalRow', title: '鏄惁缁熻', width: 100, templet: '#IsTotalRow' }
                 ]]
             };
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index f302b77..1d9e803 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -176,6 +176,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -198,6 +199,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script>
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -231,7 +233,7 @@
             var option1 = [];
             var sWhere = "";
             var sBillType = "3803";
-
+            var HModName = "Sc_MouldProdBackBillEdit";
             //鍏ㄥ眬鍙橀噺
             window.HSupType = $("#HSupTypeID").val();
             //#endregion
@@ -241,7 +243,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栬〃鍗曟彃浠�
@@ -249,6 +251,7 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -275,6 +278,10 @@
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                         break;
                 }
             });
@@ -677,7 +684,7 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
@@ -894,7 +901,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             //obj.del();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index 0aa97a3..36924ce 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -14,7 +14,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
-
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <style type="text/css">
         /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
         /*.layui-form-item .layui-inline {
@@ -214,7 +214,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -261,6 +261,7 @@
             var option1 = [];
             var sWhere = "";
             var sBillType = "3801";
+            var HModName = "Sc_MouldProdInBillEdit";
             //鍏ㄥ眬鍙橀噺
             window.HSupType = $("#HSupTypeID").val();
             //#endregion
@@ -280,6 +281,7 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -306,6 +308,10 @@
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                         break;
                 }
             });
@@ -757,7 +763,7 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field:"搴忓彿", title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
@@ -989,7 +995,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             //obj.del();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
index 6b14222..cce6746 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBill.html"
@@ -169,7 +169,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -192,6 +192,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -228,13 +229,13 @@
             //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
-
+            var HModName = "Sc_MouldProdMoveBillEdit";
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "3814";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             var tableReload = table.reload;
             var option = {
@@ -246,7 +247,7 @@
                 , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
@@ -335,7 +336,7 @@
                 });
 
             }
-
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
 
             //澶村伐鍏锋爮浜嬩欢
             var rowid = 0;
@@ -371,6 +372,10 @@
                             //layer.alert(copyrow);
                         }
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+                        break;
                 }
             });
             //琛屽唴浜嬩欢
@@ -380,7 +385,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             obj.del();
@@ -541,7 +546,7 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
-                                    
+
                                     if (typeof (OptionData) != "undefined" && OptionData != []) {
                                         var HStockStyle = $("#HStockStyle").val();
                                         if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁�                                    {
@@ -1413,7 +1418,7 @@
         function GetGyStockPlace(obj)           //浠撲綅
         {
             OptionData = obj;
-        } 
+        }
         function GetOrganization(obj)           //缁勭粐
         {
             OptionData = obj;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 8fe19f2..ac75ae5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -182,7 +182,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -206,6 +206,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script>
         var params = get_UrlVars();
         if (typeof (params[params[0]]) == "undefined") {
@@ -237,7 +238,7 @@
             var option1 = [];
             var sWhere = "";
             var sBillType = "3802";
-
+            var HModName = "Sc_MouldProdOutBillEdit";
             //鍏ㄥ眬鍙橀噺
             window.HSupType = $("#HSupTypeID").val();
             //#endregion
@@ -268,13 +269,14 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -300,6 +302,10 @@
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                         break;
                 }
             });
@@ -700,7 +706,7 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field:'搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
@@ -917,7 +923,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             //obj.del();
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
index 5c616f4..ce4d67d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill.html"
@@ -192,7 +192,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -215,6 +215,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script>
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -246,7 +247,7 @@
             var option1 = [];
             var sWhere = "";
             var sBillType = "3831";
-
+            var HModName = "Sc_MouldScrapInBillEdit";
             //鍏ㄥ眬鍙橀噺
             window.HSupType = $("#HSupTypeID").val();
             //TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
@@ -259,13 +260,14 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -291,6 +293,10 @@
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
                         break;
                 }
             });
@@ -744,7 +750,7 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
@@ -967,7 +973,7 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
                             //obj.del();
@@ -1480,7 +1486,7 @@
             } else {
                 $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
                 $("#HDeptID").val(obj[0].HItemID);
-            }            
+            }
         }
 
         function GetHSupNameValue(obj)           //寰�鏉ュ崟浣嶏紙渚涘簲鍟嗭級
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
index 3aa5537..ffc858a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapOutBill.html"
@@ -181,7 +181,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -204,6 +204,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script>
         //鑾峰彇椤甸潰璺宠浆鍙傛暟
         var params = get_UrlVars();
@@ -234,7 +235,7 @@
                 , element = layui.element;
             var option;
             var sBillType = "3832";
-
+            var HModName = "Sc_MouldScrapOutBillEdit";
             //鍏ㄥ眬鍙橀噺
             window.HSupType = $("#HSupTypeID").val();
             //var TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }
@@ -248,7 +249,7 @@
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
             $("h1").html('<b>' + HPageTitle + '</b>');
-			//#endregion
+            //#endregion
 
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
@@ -256,6 +257,7 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
@@ -511,6 +513,10 @@
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+                        break;
                 }
             });
 
@@ -698,7 +704,7 @@
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', field: '搴忓彿', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
                     , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
new file mode 100644
index 0000000..9cdfc63
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
@@ -0,0 +1,1181 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐝寮�鐝崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+            var option = [];
+            var sWhere = "";
+            var HModName = "Gy_EnvironmentTestSchemeBillList";
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HWorkCenterID", "HShiftsID", "HSourceID", "HGroupID","HGroupLeaderID"];
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3768";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鐝寮�鐝崟";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.HInterID
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鐢熶骇绠$悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0"); $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0"); $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ShiftsBeginInfoBill/get锘縎c_ShiftsBeginInfoBillMainList',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [];
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'HInterID') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+                            ins = table.render(option);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鐢熶骇绠$悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠$悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏂板' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠$悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length > 0) {
+                    var linterid = data[0].HInterID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_ShiftsBeginInfoBill/Delete锘縎c_ShiftsBeginInfoBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": linterid,"user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_FastQuery();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_ShiftsBeginInfoBill/AuditSc_ShiftsBeginInfoBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_ShiftsBeginInfoBill/CloseSc_ShiftsBeginInfoBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "Sc_ShiftsBeginInfoBill/DropSc_ShiftsBeginInfoBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["HInterID", "HEntryID", "HDeptID", "HReceiveDeptID", "HErrMsgBackTypeID", "HOrgID", "HDutyID"];
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);      $("#ColName1").empty();
+                $("#ColName1").append(Organization);      $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].HInterID;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].HInterID
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(2)
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(1)
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+            function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+            {
+                var HInterID = obj[0].HInterID;
+                HInterID_Choose = obj[0].HInterID;
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = data1.data;
+                            //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            HInterID = data[0].HInterID
+                            //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
new file mode 100644
index 0000000..c126cbd
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
@@ -0,0 +1,1091 @@
+锘�
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐝寮�鐝崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <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>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+    </style>
+</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: 2px; ">
+                        <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="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鐝寮�鐝崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; float: left; width: 150px; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHDept" id="btnSearchHDept" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">宸ヤ綔涓績<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HWorkCenterName" name="HWorkCenterName" id="HWorkCenterName" style="background-color: #efefef4d; float: left; width: 150px; display: inline-block;" readonly>
+                                                <input type="hidden" name="HWorkCenterID" id="HWorkCenterID" lay-verify="HWorkCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkCenter" id="btnSearchHWorkCenter" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;float:left;width:150px;display: inline-block;" readonly>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;float:left;width:150px;display: inline-block;" readonly>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHGroup" id="btnSearchHGroup" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐝<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HShiftsName" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;float:left;width:150px;display: inline-block;" readonly>
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID" lay-verify="HShiftsID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHShifts" id="btnSearchHShifts" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐝粍闀�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HGroupLeaderName" name="HGroupLeaderName" id="HGroupLeaderName" style="background-color:#efefef4d;float:left;width:150px;display: inline-block;" readonly>
+                                                <input type="hidden" name="HGroupLeaderID" id="HGroupLeaderID" lay-verify="HGroupLeaderID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHGroupLeader" id="btnSearchHGroupLeader" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">                                     
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">搴斿埌宀椾汉鏁�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HStdEmpQty" name="HStdEmpQty" id="HStdEmpQty" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">涓婂矖鑱屽憳</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--瀛愯〃-->
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                                    </div>
+                                </script>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!--瀛愯〃琛細鍒犻櫎-->
+    <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(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //妯″潡鍚�
+            var HModName = "Sc_ShiftsBeginInfoBill_Add_Edit";
+        
+            //琛ㄦ牸娓叉煋鍙傛暟
+            var option = {};            //瀛愯〃娓叉煋鍙傛暟
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+
+            //鍏ㄥ眬鍙橀噺
+            window.OptionData = [];
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3768";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+
+
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+                
+                OperationType = 1;
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+            }
+            else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new                                        //澶嶅埗
+                OperationType = 1;
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+                RoadBillMain(linterid);
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new                                        //缂栬緫               
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+                RoadBillMain(linterid);
+            }
+            //#endregion
+
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(btnSearchHDept)', function () {
+                get_checkSearchHDept();
+            });
+            //#endregion
+
+            //#region 閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(btnSearchHWorkCenter)', function () {
+                get_checkSearchHWorkCenter();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鎸夐挳
+            form.on('submit(btnSearchHGroup)', function () {
+                get_checkSearchHGroup();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鐝鎸夐挳
+            form.on('submit(btnSearchHShifts)', function () {
+                get_checkSearchHShifts();
+            });
+            //#endregion
+
+            //#region 閫夋嫨鐢熶骇璧勬簮鎸夐挳
+            form.on('submit(btnSearchHSource)', function () {
+                get_checkSearchHSource();
+            });
+            //#endregion
+            //#region 閫夋嫨鐝粍闀挎寜閽�
+            form.on('submit(btnSearchHGroupLeader)', function () {
+                get_checkSearchHGroupLeader();
+            });
+            //#endregion
+           
+
+            //#endregion
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+          
+            //#endregion
+
+            //#endregion
+
+            //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow =
+                {
+                   "HWorkEmpID": "0"
+                    , "HWorkEmpNumber": ""
+                    , "HWorkEmpName": ""
+                    , "HRemark": ""
+                    , "HReceiveType": ""
+                    , "HSourceInterID": "0"
+                    , "HSourceEntryID": "0"
+                    , "HSourceBillNo": ""
+                    , "HSourceBillType": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                     
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                          
+                        }
+                        break;
+                    //涓婁竴琛�
+                    case 'btn_up':
+                        btn_up(data);
+                        break;
+                    //涓嬩竴琛�
+                    case 'btn_under':
+                        btn_under(data);
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+            //#endregion                 
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶          
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3768' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 瀛愯〃鍒濆鍖�
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 100
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HWorkEmpID', title: '鑱屽憳id', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HWorkEmpNumber', title: '鑱屽憳缂栫爜', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HWorkEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', event: "HWorkEmpName", style: 'background-color: #f9f9f9;' } //f7
+                        , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                        , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }     //f7
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HWorkEmpID": "0"
+                        , "HWorkEmpNumber": ""
+                        , "HWorkEmpName": ""
+                        , "HRemark": ""
+                        , "HReceiveType": ""
+                        , "HSourceInterID": "0"
+                        , "HSourceEntryID": "0"
+                        , "HSourceBillNo": ""
+                        , "HSourceBillType": ""
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                form.render('select');
+            }
+            //#endregion        
+
+            //#region 鐝粍闀�
+            function get_checkSearchHGroupLeader() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HGroupLeaderID").val(checkStatus.data[0].HItemID);                      
+                        $("#HGroupLeaderName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 閮ㄩ棬
+            function get_checkSearchHDept() {             
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 宸ヤ綔涓績
+            function get_checkSearchHWorkCenter() {             
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+                        $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 鐝
+            function get_checkSearchHShifts() {            
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+                        $("#HShiftsID").val(checkStatus.data[0].HInterID);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 鐝粍
+            function get_checkSearchHGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?type=HGroup', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 鐢熶骇璧勬簮
+            function get_checkSearchHSource() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+                        $("#HSourceID").val(checkStatus.data[0].HItemID);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                    , end: function () { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+                //鑾峰彇瀛愯〃鏁版嵁
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                //鑾峰彇鎿嶄綔鏂瑰紡
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    refSav = "Update";
+                    data.field.HUpdater = sessionStorage["HUserName"];
+                    data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd"); 
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //瀛愯〃鏁版嵁搴忓垪鍖�
+                var sSubStr = JSON.stringify(num);
+
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Sc_ShiftsBeginInfoBill/Save锘縎c_ShiftsBeginInfoBillMain",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+
+                        }
+                        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
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ShiftsBeginInfoBill/Sc_ShiftsBeginInfoBillMainEditList",
+                    type: "GET",
+                    async: false,
+                    data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data;
+                        var tableSub = result.data;
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": OperationType == 2 ? "" : data[0]["HInterID"]
+                            , "HBillNo": OperationType == 2 ? "" : data[0]["鍗曟嵁鍙�"]
+                            , "HDate": formatDate(data[0]["鏃ユ湡"])
+                            , "HDeptID": data[0]["HDeptID"]
+                            , "HDeptName": data[0]["閮ㄩ棬"]
+                            , "HWorkCenterID": data[0]["HWorkCenterID"]
+                            , "HWorkCenterName": data[0]["宸ヤ綔涓績"]
+                            , "HShiftsID": data[0]["HShiftsID"]
+                            , "HShiftsName": data[0]["鐝"]
+                            , "HSourceID": data[0]["HSourceID"]
+                            , "HSourceName": data[0]["鐢熶骇璧勬簮"]
+                            , "HGroupID": data[0]["HGroupID"]
+                            , "HGroupName": data[0]["鐝粍"]
+                            , "HGroupLeaderID": data[0]["HGroupLeaderID"]
+                            , "HGroupLeaderName": data[0]["鐝粍闀�"]                        
+                            , "HStdEmpQty": data[0]["搴斿埌宀椾汉鏁�"]
+
+                            , "HRemark": data[0]["琛ㄥご澶囨敞"]
+                            , "HMaker": data[0]["鍒跺崟浜�"]
+                            , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HUpDater": data[0]["淇敼浜�"]
+                            , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HChecker": data[0]["瀹℃牳浜�"]
+                            , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCloseMan": data[0]["鍏抽棴浜�"]
+                            , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HDeleteMan": data[0]["浣滃簾浜�"]
+                            , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+                        });
+
+                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                        HOrgIDBar = data[0]["HOrgID"];
+                        //瀛愯〃  璧嬪��
+
+                        var rowdata = [];
+                        for (var i = 0; i < tableSub.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HWorkEmpID": tableSub[i].HWorkEmpID, "HWorkEmpNumber": tableSub[i].鑱屽憳浠g爜,
+                                    "HWorkEmpName": tableSub[i].鑱屽憳鍚嶇О,  "HRemark": tableSub[i].澶囨敞
+                                }
+                            )
+                        }
+                        option.data = rowdata;
+                        table.render(option);
+                    }
+                })
+            }
+            //#endregion          
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HWorkCenterID").val() == "0") {
+                    layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HShiftsID").val() == "0") {
+                    layer.msg("鐝涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HStdEmpQty").val() == "") {
+                    layer.msg("搴斿埌宀椾汉鏁颁笉鑳戒负绌�!");
+                    return false;
+                }
+
+                //#region 瀛愯〃鏁版嵁妫�楠�
+                //for (var i = 0; i < option.data.length; i++) {
+                //    if (option.data[i] != "") {
+                //        layer.msg("绗�" + (i + 1) + "琛�:涓婂矖鑱屽憳涓嶈兘涓虹┖!");
+                //        return false;
+                //    }
+                //}
+                //#endregion
+
+                //#endregion
+
+
+                return true;
+            }
+            //#endregion
+
+            //#region 瀛愯〃锛氬垹闄ゆ寚瀹氳
+            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 = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1)
+                            option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            for (var i = 0; i < oldData.length; i++) {
+                                $('#HReceiveType' + (i + 1)).find("option[value='" + oldData[i].HReceiveType + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == "HWorkEmpName") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "鑱屽憳鍒楄〃"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', "yes"]
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    if (checkStatus.data.length === 1) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            "HWorkEmpID": checkStatus.data[0].HItemID
+                                            , "HWorkEmpNumber": checkStatus.data[0].鑱屽憳浠g爜
+                                            , "HWorkEmpName": checkStatus.data[0].鑱屽憳鍚嶇О
+
+                                        })
+                                        layer.close(index);//鍏抽棴寮圭獥
+                                    } else {
+                                        //(澶氶�夎)
+                                        //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+                                        var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < tableBak.length; i++) {
+                                            if (tableBak[i]["HWorkEmpID"] != 0 && tableBak[i]["HWorkEmpID"] != "" && tableBak[i]["HWorkEmpID"] != undefined && tableBak[i]["HWorkEmpID"] != null) {
+                                                buttonArr.push(tableBak[i]);  //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+                                            }
+                                        }
+                                        //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            buttonArr.push({ "HWorkEmpID": checkStatus.data[i].HItemID, "HWorkEmpNumber": checkStatus.data[i].鑱屽憳浠g爜, "HWorkEmpName": checkStatus.data[i].鑱屽憳鍚嶇О, "HRemark": "" });
+                                        }
+                                        // 閲嶆柊娓叉煋琛ㄦ牸锛屾洿鏂版暟鎹�
+                                        table.reload('mainTable', {
+                                            data: buttonArr
+                                        });
+                                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                    }
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+          
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁                       
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] += "font-size:100%";
+                                }                               
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                            for (var i = 0; i < option.data.length; i++) {
+                                $('#HReceiveType' + (i + 1)).find("option[value='" + option.data[i].HReceiveType + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        } else {
+                            table.render(option);
+                            for (var i = 0; i < option.data.length; i++) {
+                                $('#HReceiveType' + (i + 1)).find("option[value='" + option.data[i].HReceiveType + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+
+
+
+        });
+        //瀛愯〃f7 涓婂矖鑱屽憳
+        function GetHEmpValue(obj) {
+            OptionData = obj;
+        }
+        //鐢熶骇璧勬簮
+        function GetGySource(obj) {
+            $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+            $("#HSourceID").val(obj[0].HItemID);
+        }
+        //鐝粍
+        function GetHGroupValue(obj) {
+            $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
+        //宸ヤ綔涓績
+        function GetWorkCenterValue(obj) {
+            $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+            $("#HWorkCenterID").val(obj[0].HItemID);
+        }
+        //鐝粍闀�
+        function GetHWorkerValue(obj)
+        {
+            $("#HGroupLeaderName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HGroupLeaderID").val(obj[0].HItemID);
+        }
+        //鐢熶骇鐝
+        function GetHWorkShiftsValue(obj) {
+            $("#HShiftsID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID
+            $("#HShiftsName").val(obj[0].鐝鍚嶇О); //褰撳墠宸ュ簭
+        }
+        //閮ㄩ棬
+        function GetHDeptNameValue(obj) {
+            $("#HDeptID").val(obj[0].HItemID);//閮ㄩ棬id
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
+        }
+                
+    </script>
+</body>
+</html>
\ No newline at end of file
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_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_MESBeginWorkBillList.html"
index 418bbab..365a524 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_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_MESBeginWorkBillList.html"
@@ -13,6 +13,20 @@
         input.layui-input.layui-unselect {
             padding-right: 0;
         }
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
     </style>
 </head>
 <body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_EquipmentProcessList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_EquipmentProcessList.html"
new file mode 100644
index 0000000..3dc39ca
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_EquipmentProcessList.html"
@@ -0,0 +1,353 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧宸ヨ壓鍙傛暟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>                                       
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var HICMOInterID = "";  //鐢熶骇璁㈠崟鍐呯爜
+        var HICMOEntryID = "";  //鐢熶骇璁㈠崟瀛愮爜
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+            HICMOInterID = data[0].HICMOInterID;
+            HICMOEntryID = data[0].HICMOEntryID;
+        };
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+            var option = [];
+            var sWhere = "";
+            var HModName = "Sc_EquipmentProcessList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "HEntryID", "HDeptID", "HProcID", "HEquipID", "HMaterID", "HTechParamClassID", "HTechParamID", "璁惧浠g爜", "HTechParamIDStd", "宸ヨ壓娆″簭", "HTechParamUnitID","HUnitID"];
+
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            //#endregion
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {                    
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;                 
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(1);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            var autoQueryInterval;
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {              
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                if (OperationType==4) {
+                    //鏌ヨ
+                    get_FastQuery();
+                    autoQueryInterval= setInterval(get_FastQuery, 60000); // 60000ms = 1鍒嗛挓
+                }              
+            }
+            window.onbeforeunload = function () {
+                if (autoQueryInterval) {
+                    clearInterval(autoQueryInterval);  // 娓呴櫎瀹氭椂鍣�
+                    console.log('瀹氭椂鍣ㄥ凡娓呴櫎');
+                }
+            };
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+       
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                console.log('鏌ヨ鏁版嵁...');
+                sWhere = {
+                    HEquipID: HEquipID
+                    , HICMOInterID: HICMOInterID
+                    , HICMOEntryID: HICMOEntryID
+                }
+
+                get_Display(JSON.stringify(sWhere));
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipICMOTechParamList_Json',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }                                
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 160 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion    
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+           
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }                             
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+      
+
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OEEStatusReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OEEStatusReport.html"
new file mode 100644
index 0000000..bb197ce
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OEEStatusReport.html"
@@ -0,0 +1,487 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>OEE鎶ヨ〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁煎悎OEE</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="OEE" id="OEE" readonly>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <div style="width:99%;height:calc(100vh);">
+                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:30px;">
+                            </div>
+                        </div>
+
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //鑾峰彇鍙傛暟
+        var HEquipNumber = "";  //璁惧id
+        var edit = function (data) {
+            HEquipNumber = data[0].HEquipNumber;
+        }
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], 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
+            var option = [];
+            var sWhere = "";
+            var HModName = "Sc_OEEReport";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;                 
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(1);
+                        break;                  
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion      
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {              
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_FastQuery();
+
+                //鍔犺浇鎶樼嚎鍥�
+                set_Graphics();
+
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+            //#endregion           
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {      
+                var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 15), "yyyy-MM-dd"); //寮�濮嬫棩鏈�
+                var HEndDate = Format(new Date(), "yyyy-MM-dd");    //缁撴潫鏃ユ湡
+
+                sWhere = " 4,'" + HEquipNumber + "','','',''";
+
+                sWhere += ",'" + HBeginDate + "','" + HEndDate + "'";
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_OEEReport/list',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var totalArray = [""];
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            ins = table.render(option);
+
+
+                            //璁$畻缁煎悎OEE
+                            var OEE = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                OEE += data1.data[i].OEE.replace("%", "") * 1
+                            }
+                            if (data1.data.length > 0) {
+                                OEE = OEE / data1.data.length + "%"
+                            } else {
+                                OEE += "%";
+                            }
+                            $("#OEE").val(OEE);
+
+                        
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion          
+
+
+            //#region 銆愭姌绾垮浘銆�
+            function set_Graphics() {
+                var chartDom1 = document.getElementById('histogram');
+                var myChart = echarts.init(chartDom1);
+                var option_ZZT1;
+
+                //鏌辩姸鍥剧粦瀹氭暟鎹�
+                var H_X1 = [];//X杞存爣棰�
+                var HOEE = [];//璁惧OEE
+                var PerformanceUtilizationRate = [];//鎬ц兘绋煎姩鐜�
+                var TimeUtilizationRate = [];//鏃堕棿绋煎姩鐜�
+                var HTitle = "璁惧OEE";//鍥惧舰鏍囬
+                if (option.data.length > 0) {
+                    for (let i = 0; i < option.data.length; i++) {
+                        H_X1.push(option.data[i].鏃ユ湡);
+                    }
+                    // 濉厖鏁版嵁
+                    for (let i = 0; i < option.data.length; i++) {
+
+                        HOEE.push((option.data[i].OEE).replace('%', ''));
+                        PerformanceUtilizationRate.push((option.data[i].鎬ц兘绋煎姩鐜�).replace('%', ''));
+                        TimeUtilizationRate .push((option.data[i].鏃堕棿绋煎姩鐜�).replace('%', ''));
+                    }
+                }
+                option_ZZT1 = {
+                    title: {
+                        text: HTitle,
+                        left: 'center'
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        formatter: function (params) {
+                            let tooltipHtml = params[0].axisValue + '<br>'; // X杞存暟鍊�
+
+                            params.forEach(function (item) {
+                                let valueToShow = parseFloat(item.value); // 灏嗗瓧绗︿覆杞崲涓烘暟鍊�
+                                tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // Y杞存暟鍊硷紝骞舵坊鍔犵櫨鍒嗗彿
+                            });
+
+                            return tooltipHtml;
+                        }
+                    },
+                    legend: {
+                        data: ['OEE', '鎬ц兘绋煎姩鐜�','鏃堕棿绋煎姩鐜�'],
+                        top: 'bottom',
+                        left: 'center'
+                    },
+                    toolbox: {
+                        show: true,
+                        orient: 'vertical',
+                        left: 'right',
+                        top: 'center',
+                        feature: {
+                            mark: { show: true },
+                            dataView: { show: true, readOnly: false },
+                            magicType: { show: true, type: ['line', 'bar', 'stack'] },
+                            restore: { show: true },
+                            saveAsImage: { show: true }
+                        }
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            axisTick: { show: false },
+                            data: H_X1
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value',
+                            axisLabel: {
+                                formatter: '{value} %'
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: 'OEE',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#00FF00' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+                                    },
+                                    color: '#00FF00' // 璁剧疆绾挎潯棰滆壊涓虹豢鑹�
+                                }
+                            },
+                            data: HOEE
+                        },
+                        {
+                            name: '鎬ц兘绋煎姩鐜�',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹测��
+                                    },
+                                    color: '#FF0000' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+                                }
+                            },
+                            data: PerformanceUtilizationRate
+                        },
+                        {
+                            name: '鏃堕棿绋煎姩鐜�',
+                            type: 'line',
+                            label: {
+                                show: true,
+                                formatter: '{c}%'
+                            },
+                            itemStyle: {
+                                normal: {
+                                    lineStyle: {
+                                        color: '#00FFFF' // 璁剧疆绾挎潯棰滆壊涓洪潚鑹�
+                                    },
+                                    color: '#00FFFF' // 璁剧疆绾挎潯棰滆壊涓洪潚鑹�
+                                }
+                            },
+                            data: TimeUtilizationRate
+                        }
+                    ]
+                };
+
+                option_ZZT1 && myChart.setOption(option_ZZT1);
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
index 80cbae9..0619d6f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\242\345\215\225\347\212\266\346\200\201\345\210\206\345\270\203/Sc_OrderStateDistribution.html"
@@ -12,6 +12,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/layui1.js"></script>
     <script src="../../../layuiadmin/echarts.min.js"></script>
+    <link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />
     <style>
         /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
         .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
@@ -27,22 +28,12 @@
 
         .bottomright {
             cursor: pointer; /*榧犳爣鍙樻垚鎵嬫寚鏍峰紡*/
-            transition: all 0.6s; /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
+            transition: all 0.1s; /*鎵�鏈夊睘鎬у彉鍖栧湪0.6绉掑唴鎵ц鍔ㄧ敾*/
         }
 
-            .bottomright:hover {
-                transform: scale(1.3); /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
-            }
-
-        .imgicon {
-            /*width: 50%;
-            height: 50px;*/
-            /*display: block;*/
-            /*text-align: center;
-            line-height: 50px;
-            float: left;*/
-        }
-
+        .bottomright:hover {
+           transform: scale(1.3); /*榧犳爣鏀句笂涔嬪悗鍏冪礌鍙樻垚1.4鍊嶅ぇ灏�*/
+        }        
         .imgtitle {
             width: 70%;
             height: 50px;
@@ -59,13 +50,13 @@
             border-radius: 5px;
         }
 
-            .cns p {
-                font-size: 12px;
-                line-height: 18px;
-                margin: 0 5px;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                overflow: hidden;
+        .cns p {
+            font-size: 12px;
+            line-height: 18px;
+            margin: 0 5px;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
             }
 
         .check1 {
@@ -93,16 +84,20 @@
             margin-left: 3%;
             margin-top: 4%;
             height: 310px;
-            /*background-color: #99f6a733;*/
             border: 1px solid rgb(0 0 0 / 10%);
             width: 95%;
         }
+
         .btnM {
             width: 30%;
             height: 50px;
             line-height: 50px;
             float: left;
-            text-align:right;
+            text-align: right;
+        }
+
+        .layui-icon {
+            font-size: 20px;
         }
     </style>
 </head>
@@ -126,7 +121,7 @@
                                     <legend style="color: #5FB878">鎿嶄綔鍙�</legend>
                                     <div class="content4">
                                         <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="OpenWork(event,this)">
+                                            <div class="layui-col-sm12 " onclick="PowerOn(event,this)">
                                                 <div class="cnt bottomright">
                                                     <div class="btnM">
                                                         <span class="layui-icon layui-icon-pause imgicon"></span>
@@ -136,7 +131,27 @@
                                             </div>
                                         </div>
                                         <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="OpenReport(event,this)">
+                                            <div class="layui-col-sm12 " onclick="PowerOff(event,this)">
+                                                <div class="cnt bottomright">
+                                                    <div class="btnM">
+                                                        <span class="layui-icon layui-icon-logout imgicon"></span>
+                                                    </div>
+                                                    <span class="imgtitle">鍋滄満</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row layui-col-space10">
+                                            <div class="layui-col-sm12 " onclick="DotCheck(event,this)">
+                                                <div class="cnt bottomright">
+                                                    <div class="btnM">
+                                                        <span class="layui-icon layui-icon-list imgicon"></span>
+                                                    </div>
+                                                    <span class="imgtitle">鐐规璁板綍</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row layui-col-space10">
+                                            <div class="layui-col-sm12 " onclick="FaultRegistration(event,this)">
                                                 <div class="cnt bottomright">
                                                     <div class="btnM">
                                                         <span class="layui-icon layui-icon-list imgicon"></span>
@@ -146,42 +161,43 @@
                                             </div>
                                         </div>
                                         <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="OpenEnd(event,this)">
+                                            <div class="layui-col-sm12 " onclick="Maintenance(event,this)">
                                                 <div class="cnt bottomright">
                                                     <div class="btnM">
-                                                        <span class="layui-icon layui-icon-logout imgicon"></span>
+                                                        <span class="layui-icon layui-icon-form imgicon"></span>
                                                     </div>
                                                     <span class="imgtitle">缁翠慨</span>
                                                 </div>
                                             </div>
                                         </div>
+
                                         <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+                                            <div class="layui-col-sm12 " onclick="Resume(event,this)">
                                                 <div class="cnt bottomright">
                                                     <div class="btnM">
-                                                        <span class="layui-icon layui-icon-pause imgicon"></span>
-                                                    </div>
-                                                    <span class="imgtitle">鍋滄満</span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
-                                                <div class="cnt bottomright">
-                                                    <div class="btnM">
-                                                        <span class="layui-icon layui-icon-pause imgicon"></span>
+                                                        <span class="layui-icon layui-icon-table imgicon"></span>
                                                     </div>
                                                     <span class="imgtitle">灞ュ巻</span>
                                                 </div>
                                             </div>
                                         </div>
                                         <div class="layui-row layui-col-space10">
-                                            <div class="layui-col-sm12 " onclick="KSOpenWork(event,this)">
+                                            <div class="layui-col-sm12 " onclick="Process(event,this)">
                                                 <div class="cnt bottomright">
                                                     <div class="btnM">
-                                                        <span class="layui-icon layui-icon-pause imgicon"></span>
+                                                        <span class="layui-icon layui-icon-file imgicon"></span>
                                                     </div>
                                                     <span class="imgtitle">宸ヨ壓</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row layui-col-space10">
+                                            <div class="layui-col-sm12 " onclick="HStatus(event,this)">
+                                                <div class="cnt bottomright">
+                                                    <div class="btnM">
+                                                        <span class="layui-icon layui-icon-set imgicon"></span>
+                                                    </div>
+                                                    <span class="imgtitle">鐘舵��</span>
                                                 </div>
                                             </div>
                                         </div>
@@ -191,10 +207,10 @@
                         </div>
                         <div class="layui-row">
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-1" id="mychart1">   </div>
+                                <div class="tr1-1" id="mychart11">   </div>
                             </div>
                             <div class="layui-col-xs3 layui-inline">
-                                <div class="tr1-2" id="mychart2">   </div>
+                                <div class="tr1-2" id="mychart22">   </div>
                             </div>
                             <div class="layui-col-xs3 layui-inline">
                                 <div class="tr1-3" id="mychart3">   </div>
@@ -211,542 +227,884 @@
 </body>
 </html>
 <script>
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], 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
-                , tree = layui.tree
-            var sWhere = "";
-            var wktag = 0;
-            //#endregion
+    var wktag = 0;
+    var HEquipID = 0;//璁惧id
+    var HEquipNumber = "";//璁惧缂栫爜
+    var HEquipName = "";//璁惧鍚嶇О
+    var HSourceID = "";//浜х嚎id
+    var HDeptID = "";
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index', //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'tree'], 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
+            , tree = layui.tree
+        //#endregion
 
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鍒濆鍖栫晫闈�
-            set_ClearBill();
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
 
-            //#endregion
+        //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-         
-
-        
-            //#endregion
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
 
-            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
-
-            //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                var mychart1 = echarts.init(document.getElementById('mychart1'));
-                var mychart2 = echarts.init(document.getElementById('mychart2'));
-                var mychart3 = echarts.init(document.getElementById('mychart3'));
-                var mychart4 = echarts.init(document.getElementById('mychart4'));
-                get_Histogram1(mychart1);//鏌辩姸鍥�1
-                get_LineChart(mychart2);//鎶樼嚎
-                get_Statistics(mychart3);//楗煎浘
-                get_Histogram4(mychart4);//鏌辩姸鍥�4
-             
-                //鏌ヨ
-                get_Display_Tree();
-
-            }
-            //#endregion
-
-            function Check(sWhere) {
-                wktag = 0;
-                $("#btomleft").html("");
-                $.ajax({
-                    url: GetWEBURL() + '/Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
-                    dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
-                    success: function (data) {
-
-                        //var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
-                        var LoadData1 = data.data.h_p_sc_HDeptSouceMOList;
-                        //var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
-                        if (LoadData1.length > 0)  //宸ュ崟鍒楄〃鏁版嵁
-                        {
-
-                            for (var i = 0; i < LoadData1.length; i++) {
-                                var html1 = '';
-                                html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 6px;width: 135px;">';
-                                html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
-                                html1 += '<dl>';
-                                html1 += '<dd class="tcenter">';
-                                html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
-                                //HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp  HInterID锛堝崟鎹富ID锛�
-                                html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
-                                html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
-                                html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
-                                html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
-                                html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
-                                html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
 
 
-                                html1 += '<p><span>浜х嚎锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].浜х嚎 + '</span></p>';
-                                html1 += '<p><span>褰撳墠璁㈠崟锛�</span><span id="wk' + (i + 1) + '">' + LoadData1[i].璁㈠崟 + '</span></p>';
-                                html1 += '<p><span>浜ч噺锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
-                                html1 += '<p><span>鐘舵�侊細</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
-                                html1 += '<p><span>杩愯鏃堕暱锛�</span><span>' + LoadData1[i].鐘舵�� + '</span></p>';
-                                html1 += '<p><span>缁翠慨鏃堕暱锛�</span><span>' + LoadData1[i].璁″垝鏁伴噺 + '</span></p>';
-                                html1 += '<p><span>绋煎姩鐜囷細</span><span>35%</span></p>';
-                                html1 += '</dd>';
-                                html1 += '</dl>';
-                                html1 += '</div>';
-                                html1 += '</div>';
-                                $("#btomleft").append(html1);
+        //#endregion
+
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+        //#region 鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            var mychart11 = echarts.init(document.getElementById('mychart11'));
+            var mychart22 = echarts.init(document.getElementById('mychart22'));
+            var mychart3 = echarts.init(document.getElementById('mychart3'));
+            var mychart4 = echarts.init(document.getElementById('mychart4'));
+            get_Histogram1(mychart11, '');//鏌辩姸鍥�1
+            get_LineChart(mychart22, '');//鎶樼嚎
+            get_Statistics(mychart3, '');//楗煎浘
+            get_Histogram4(mychart4, '');//鏌辩姸鍥�4
+
+            //鏌ヨ
+            get_Display_Tree();
+        }
+        //#endregion
+
+        //鏌ヨ宸ュ崟
+        function Check(HDeptID) {
+            wktag = 0;
+            $("#btomleft").html("");
+            $.ajax({
+                url: GetWEBURL() + '/Sc_HEquipStateDistribution/Sc_HEquipStateDistribution_Souce',
+                type: "GET",
+                data: { "HDeptID": HDeptID, "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
+                dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+                success: function (data) {
+
+                    var LoadData1 = data.data.h_p_sc_HDeptSouceMOList;
+                    if (LoadData1.length > 0)  //宸ュ崟鍒楄〃鏁版嵁
+                    {
+
+                        for (var i = 0; i < LoadData1.length; i++) {
+                            var html1 = '';
+                            html1 += '<div class="layui-col-sm12 layui-col-md2" style="margin: 6px;width: 180px;">';
+                            html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
+                            html1 += '<dl>';
+                            html1 += '<dd class="tcenter">';
+                            html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].鐢熶骇璁㈠崟涓诲唴鐮� + '</span></h1>';
+                            html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].鐢熶骇璁㈠崟瀛愬唴鐮� + '</span></h1>';
+                            html1 += '<h1 style="display:none;"><span>浜х嚎ID锛�</span><span id="cs' + (i + 1) + '">' + LoadData1[i].HSourceID + '</span></h1>';
+                            html1 += '<h1 style="display:none;"><span>璁惧ID锛�</span><span id="sb' + (i + 1) + '">' + LoadData1[i].璁惧id + '</span></h1>';
+
+                            html1 += '<p><span>璁惧缂栫爜锛�</span><span id="sbbm' + (i + 1) + '">' + LoadData1[i].璁惧缂栫爜 + '</span></p>';
+                            html1 += '<p><span>璁惧鍚嶇О锛�</span><span id="sbmc' + (i + 1) + '">' + LoadData1[i].璁惧鍚嶇О + '</span></p>';
+                            html1 += '<p><span>浜х嚎锛�</span><span id="cxmc' + (i + 1) + '">' + LoadData1[i].浜х嚎 + '</span></p>';
+                            html1 += '<p><span>褰撳墠璁㈠崟锛�</span><span id="gd' + (i + 1) + '">' + LoadData1[i].鐢熶骇璁㈠崟 + '</span></p>';
+                            html1 += '<p><span>璁㈠崟鏁伴噺锛�</span><span id="ddqty' + (i + 1) + '">' + LoadData1[i].浠诲姟鍗曟暟閲� + '</span></p>';
+                            html1 += '<p><span>瀹屾垚鏁伴噺锛�</span><span id="wcqty' + (i + 1) + '">' + LoadData1[i].娴佽浆鍗℃暟閲� + '</span></p>';
+                            switch (LoadData1[i].璁惧鐘舵��) {
+                                case "绌洪棽":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border6"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "寮�鏈�":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "鍋滄満":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "鐢熶骇":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "缁翠慨涓�":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border5"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "鏁呴殰":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                case "缁翠慨瀹屾垚":
+                                    html1 += '<p><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border7"></span><span>' + LoadData1[i].璁惧鐘舵�� + '</span></p>';
+                                    break;
+                                default:
                             }
-                        }                        
-                    },
-                    error: function (err) {
-                        layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
-                        return false;
-                    }
-                });
-
-
-            }
-
-      
-
-            // 鏍戠姸鍥炬煡璇�
-            function get_Display_Tree() {
-                var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
-                    data: { "sWhere": sWhere },
-                    type: "GET",
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            layer.close(ajaxLoad);
-                            var data = JSON.parse(data1.data);
-                            MenuMain(data);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //閬嶅巻鐢熸垚涓昏彍鍗�
-            function MenuMain(data) {
-                var liStr = '[';
-                //閬嶅巻鐢熸垚涓昏彍鍗�
-                for (var i = 0; i < data.length; i++) {
-                    // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
-                    if (data[i].children != null && data[i].children.length > 0) {
-                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
-                        // 閬嶅巻鑾峰彇瀛愯彍鍗�
-                        for (var k = 0; k < data[i].children.length; k++) {
-                            liStr += getChildMenu(data[i].children[k], 0);
-                        }
-                        liStr = liStr.substring(0, liStr.length - 1);
-                        liStr += ']},';
-                    } else {
-                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
-                    }
-                };
-                liStr = liStr.substring(0, liStr.length - 1);
-                liStr += "]";
-                var treeTable = JSON.parse(liStr);
-                tree.render({
-                    elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
-                    , data: treeTable
-                    , click: function (obj) {
-                        //楂樹寒鍙樿壊
-                        $(".layui-tree-set").removeClass('layui-tree-set-active');
-                        obj.elem.addClass('layui-tree-set-active');
-
-                        var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-                        var HDeptID = 0;
-                        if (data.id == "0") {
-                         
-                        } else {
-                            HDeptID = data.id ;
-                        }
-                        Check(HDeptID);
-                    }
-                });
-            }
-
-            // 閫掑綊鐢熸垚瀛愯彍鍗�
-            function getChildMenu(subMenu, num) {
-                num++;
-                var subStr = '';
-                if (subMenu.children != null && subMenu.children.length > 0) {
-                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
-                    for (var j = 0; j < subMenu.children.length; j++) {
-                        subStr += getChildMenu(subMenu.children[j], num);
-                        if (j + 1 == subMenu.children.length) {
-                            subStr = subStr.substring(0, subStr.length - 1);
+                            html1 += '</dd>';
+                            html1 += '</dl>';
+                            html1 += '</div>';
+                            html1 += '</div>';
+                            $("#btomleft").append(html1);
                         }
                     }
-                    subStr += ']},';
-                } else {
-                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+                },
+                error: function (err) {
+                    layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+                    return false;
                 }
-                return subStr;
+            });
+        }
+
+        // 鏍戠姸鍥炬煡璇�
+        function get_Display_Tree() {
+            var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
+                data: { "sWhere": sWhere },
+                type: "GET",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(ajaxLoad);
+                        var data = JSON.parse(data1.data);
+                        MenuMain(data);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //閬嶅巻鐢熸垚涓昏彍鍗�
+        function MenuMain(data) {
+            var liStr = '[';
+            //閬嶅巻鐢熸垚涓昏彍鍗�
+            for (var i = 0; i < data.length; i++) {
+                // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+                if (data[i].children != null && data[i].children.length > 0) {
+                    liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+                    // 閬嶅巻鑾峰彇瀛愯彍鍗�
+                    for (var k = 0; k < data[i].children.length; k++) {
+                        liStr += getChildMenu(data[i].children[k], 0);
+                    }
+                    liStr = liStr.substring(0, liStr.length - 1);
+                    liStr += ']},';
+                } else {
+                    liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+                }
+            };
+            liStr = liStr.substring(0, liStr.length - 1);
+            liStr += "]";
+            var treeTable = JSON.parse(liStr);
+            tree.render({
+                elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+                , data: treeTable
+                , click: function (obj) {
+                    //楂樹寒鍙樿壊
+                    $(".layui-tree-set").removeClass('layui-tree-set-active');
+                    obj.elem.addClass('layui-tree-set-active');
+
+                    var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+                    HDeptID = 0;
+                    if (data.id == "0") {
+
+                    } else {
+                        HDeptID = data.id;
+                    }
+                    Check(HDeptID);
+                }
+            });
+        }
+
+        // 閫掑綊鐢熸垚瀛愯彍鍗�
+        function getChildMenu(subMenu, num) {
+            num++;
+            var subStr = '';
+            if (subMenu.children != null && subMenu.children.length > 0) {
+                subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+                for (var j = 0; j < subMenu.children.length; j++) {
+                    subStr += getChildMenu(subMenu.children[j], num);
+                    if (j + 1 == subMenu.children.length) {
+                        subStr = subStr.substring(0, subStr.length - 1);
+                    }
+                }
+                subStr += ']},';
+            } else {
+                subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
             }
+            return subStr;
+        }
 
-
-            //鏌辩姸鍥�1
-            function get_Histogram1(mychart1) {
-
-                //鐢熶骇璐熻嵎
-                var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-             
-                var option = {
-                    xAxis: {
-                        type: 'category',
-                        data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�']
-                    },
-                    yAxis: {
-                        type: 'value'
-                    },
-                    axisLabel: {
-                        show: true,
-                        interval: 0,
-                        color: '#15b1fa',
-                        formatter: function (value) {
-                            var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
-                            var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
-                            var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
-                            var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
-                            if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
-                            {
-                                for (var i = 0; i < rowN; i++) {
-                                    var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
-                                    var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
-                                    var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
-                                    //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
-                                    temp = value.substring(start, end) + "\n";
-                                    ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
-                                }
-                                return ret;
-                            }
-                            else {
-                                return value;
-                            }
-                        }
-                    },
-                    series: [
-                        {
-                            //data: optionData,
-                            data: [23,14,45,56,12,35,64,34,62,75],
-                            type: 'bar',
-                            label: {
-                                normal: {
-                                    show: true,
-                                    position: 'top',
-                                    formatter: function (params) {
-                                        return echarts.format.addCommas(params.value);
-                                    }
-                                }
-                            }
-                            , itemStyle: {
-                                // 璁剧疆鏌卞舰鐨勯鑹�
-                                normal: {
-                                    color: '#15b1fa',
-                                    label: {
-                                        show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
-                                    }
-                                },
-                            }
-                        }
-                    ]
-                };
-                mychart1.setOption(option);
-            }
-
-            //鎶樼嚎鍥�
-            function get_LineChart(mychart2) {
-
-                //鐢熶骇鏁堢巼
-                //var res = PubRes;
-                var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-               
-
-                var option = {
-                    xAxis: {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�', '鎵撳寘鍏ュ簱']
-                    },
-                    yAxis: {
-                        type: 'value'
-                    },
-                    legend: {
-                        orient: 'vertical',
-                        data: ['12', '43'],//璁剧疆绾挎潯鐨勫悕瀛�
-                        right: 0,
-                        top: 15,
-                        textStyle: {
-                            color: '#15b1fa' //璁剧疆瀛椾綋棰滆壊
-                        }
-                    },
-                    axisLabel: {
-                        show: true,
-                        interval: 0,
-                        color: '#15b1fa',
-                        formatter: function (value) {
-                            var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
-                            var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
-                            var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
-                            var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
-                            if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
-                            {
-                                for (var i = 0; i < rowN; i++) {
-                                    var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
-                                    var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
-                                    var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
-                                    //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
-                                    temp = value.substring(start, end) + "\n";
-                                    ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
-                                }
-                                return ret;
-                            }
-                            else {
-                                return value;
-                            }
-                        }
-                    },
-                    series: [
-                        {
-                            name: '12',//涓巐egend瀵瑰簲
-                            //data: optionData,
-                            data: [23,43,56,45,67,46,35,46,23,34,35],
-                            type: 'line',
-                            label: {
-                                normal: {
-                                    show: true,
-                                    position: 'top',
-                                    formatter: function (params) {
-                                        return echarts.format.addCommas(params.value);
-                                    }
-                                }
-                            },
-                            smooth: true,//smooth灞炴�ч粯璁ゆ槸false false灏辨槸鐩寸嚎 true灏辨槸鏇茬嚎
-                            lineStyle: {
-                                color: '#15b1fa'
-                            }
-                            , itemStyle: {
-                                // 璁剧疆绾挎潯涓婄偣鐨勯鑹诧紙鍜屽浘渚嬬殑棰滆壊锛�
-                                normal: {
-                                    color: '#15b1fa',
-                                    label: {
-                                        show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
-                                    }
-                                },
-                            }, areaStyle: {}
-                        },
-                        {
-                            name: '43',
-                            data: [10, 10, 10, 10, 10, 10, 10, 10],
-                            type: 'line',
-                            smooth: true,//smooth灞炴�ч粯璁ゆ槸false false灏辨槸鐩寸嚎 true灏辨槸鏇茬嚎
-                            lineStyle: {
-                                color: '#90f083'
-                            }
-                            , itemStyle: {
-                                // 璁剧疆绾挎潯涓婄偣鐨勯鑹诧紙鍜屽浘渚嬬殑棰滆壊锛�
-                                normal: {
-                                    color: '#90f083',
-                                    label: {
-                                        show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
-                                    }
-                                },
-                            }, areaStyle: {}
-                        }
-                    ]
-                };
-
-             
-                mychart2.setOption(option);
-            }
-
-            //楗煎浘
-            function get_Statistics(mychart3) {
-
-                const colorList = ['#5470c6', '#91cc75', '#fac858', '#ee6666'];
-                var option = {
-                    title: [
-                        {
-                            text: '寮�鏈虹巼',
-                            //subtext: NetQtys + '%',
-                            subtext: 45 + '%',
-                            textStyle: {
-                                fontSize: 16,
-                                color: '#999',
-                                lineHeight: 20
-                            },
-                            subtextStyle: {
-                                fontSize: 28,
-                                color: '#00c6ff'
-                            },
-                            textAlign: 'center',
-                            left: '50%',
-                            top: '78%'
-                        },
-                        {
-                            show: true,
-                            text: '鐘舵�佸姣斿垎鏋�',
-                            textStyle: {
-                                color: '#00c6ff',
-                                fontSize: '16',
-                            },
-                            textAlign: 'center',
-                            left: '50%',
-                            top: '0%'
-                        }
-                    ],
-                    tooltip: {
-                        trigger: 'item',
-                    },
-                    legend: {
-                        type: 'scroll',
-                        icon: 'pin',
-                        top: '15%',
-                        left: 'center',
-                        textStyle: {
-                            color: '#09d1ea'
-                        }
-                    },
-                    color: colorList,
-                    series: [
-                        {
-                            name: '鍗犳瘮',
-                            type: 'pie',
-                            radius: '50%',
-                            center: ['50%', '50%'],
-                            avoidLabelOverlap: false,
-                            label: {
-                                show: false
-                            },
-                            labelLine: {
-                                show: false
-                            },
-                            data: [
-                                { name: '寮�鏈�', value: 14 },
-                                { name: '寮�宸�', value: 16 },
-                                { name: '寰呮満', value: 23 },
-                                { name: '缁翠慨涓�', value: 43 }
-                            ],
-                        }
-                    ]
-                };
-
-                mychart3.setOption(option);
-            }
-
-            //鏌辩姸鍥�4
-            function get_Histogram4(mychart1) {
-
-                //鐢熶骇璐熻嵎
-                var optionData = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-
-               
-                var option = {
-                    xAxis: {
-                        type: 'category',
-                        data: ['缂告煋', '鐑樺共瀹氬瀷', '涓婃祮瀹氬瀷', '鑹插澂鐑厜', '棰勭儷鍓�', '琛ュ埛', '鍗版瘺灏�', '鎷夊箙瀹氬瀷', '鐭嚎鐑�', '闀跨嚎鐑�']
-                    },
-                    yAxis: {
-                        type: 'value'
-                    },
-                    axisLabel: {
-                        show: true,
-                        interval: 0,
-                        color: '#15b1fa',
-                        formatter: function (value) {
-                            var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
-                            var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
-                            var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
-                            var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
-                            if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
-                            {
-                                for (var i = 0; i < rowN; i++) {
-                                    var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
-                                    var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
-                                    var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
-                                    //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
-                                    temp = value.substring(start, end) + "\n";
-                                    ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
-                                }
-                                return ret;
-                            }
-                            else {
-                                return value;
-                            }
-                        }
-                    },
-                    series: [
-                        {
-                            //data: optionData,
-                            data: [23, 14, 45, 56, 12, 35, 64, 34, 62, 75],
-                            type: 'bar',
-                            label: {
-                                normal: {
-                                    show: true,
-                                    position: 'top',
-                                    formatter: function (params) {
-                                        return echarts.format.addCommas(params.value);
-                                    }
-                                }
-                            }
-                            , itemStyle: {
-                                // 璁剧疆鏌卞舰鐨勯鑹�
-                                normal: {
-                                    color: '#15b1fa',
-                                    label: {
-                                        show: true // 鍦ㄦ姌绾挎嫄鐐逛笂鏄剧ず鏁版嵁
-                                    }
-                                },
-                            }
-                        }
-                    ]
-                };
-                mychart1.setOption(option);
-            }
-
-        });
-            //#endregion
+    });
+    //#endregion
 
     //宸ュ崟鍒楄〃閫変腑
     function CheckBtom(obj, i) {
-        //var partid = $(obj).parent().attr("id");   //鑾峰彇鐖剁骇id
-        workcode = $("#wk" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
-        HBillType = $("#ty" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(鍗曟嵁绫诲瀷)
-        HSourceInterID = $("#sm" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟涓诲唴鐮�)
-        HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
-        HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
-        HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
+        workcode = $("#gd" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(宸ュ崟鍙�)
         HICMOInterID = $("#df" + i + "").html();     //鐢熶骇璁㈠崟涓诲唴鐮�
         HICMOEntryID = $("#ds" + i + "").html();     //鐢熶骇璁㈠崟瀛愬唴鐮�
-        HMaterName = $("#ptn" + i + "").html();     //浜у搧鍚嶇О
+        HEquipID = $("#sb" + i + "").html();     //璁惧id
+        HEquipNumber = $("#sbbm" + i + "").html();     //璁惧缂栫爜
+        HEquipName = $("#sbmc" + i + "").html();     //璁惧鍚嶇О
+        HSourceID = $("#cs" + i + "").html();     //浜х嚎id
 
         $('.cns').removeClass('check1');  //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
         $("#bs" + i + "").addClass('check1'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
         if (workcode != "" && workcode != null) {
             wktag = 1;
         }
+        sWhere = {
+            HDeptID: HDeptID
+            , HSourceID: HSourceID
+        }
+        FourReport(JSON.stringify(sWhere));
     }
 
+    //鏌ヨ 閮ㄩ棬+浜х嚎 4涓浘琛� 璧嬪��
+    function FourReport(sWhere) {
+        wktag = 0;
+        $.ajax({
+            url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
+            type: "GET",
+            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "OrganizationID": sessionStorage["OrganizationID"] },
+            dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
+            success: function (data) {
+                var chartData = data.data.h_p_Sc_FourStateDistributionReport;
+                var chartData1 = data.data.h_p_Sc_FourStateDistributionReport1;
+                var chartData2 = data.data.h_p_Sc_FourStateDistributionReport2;
+                var chartData3 = data.data.h_p_Sc_FourStateDistributionReport3;
+                var mychart11 = echarts.init(document.getElementById('mychart11'));
+                var mychart22 = echarts.init(document.getElementById('mychart22'));
+                var mychart3 = echarts.init(document.getElementById('mychart3'));
+                var mychart4 = echarts.init(document.getElementById('mychart4'));
+
+                get_Histogram1(mychart11, chartData);
+                get_LineChart(mychart22, chartData1);
+                get_Statistics(mychart3, chartData2);
+                get_Histogram4(mychart4, chartData3);
+
+            },
+            error: function (err) {
+                layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
+                return false;
+            }
+        });
+    }
+
+    //鏌辩姸鍥�
+    function get_Histogram1(mychart11, chartData) {
+        // 榛樿鐨刼ption缁撴瀯
+        var option = {
+            title: {
+                text: '浜ц兘', // 榛樿鏍囬涓虹┖
+                left: 'center',
+                top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                textStyle: {
+                    fontSize: 18,
+                    color: '#ff0000'
+                }
+            },
+            grid: {
+                top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                bottom: '20%',
+                left: '10%',
+                right: '10%'
+            },
+            xAxis: {
+                type: 'category',
+                data: [] // 榛樿x杞存暟鎹负绌�
+            },
+            yAxis: {
+                type: 'value'
+            },
+            series: [
+                {
+                    data: [], // 榛樿series鏁版嵁涓虹┖
+                    type: 'bar'
+                }
+            ]
+        };
+
+        // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+        if (chartData && chartData.length > 0) {
+            option.title.text = '浜ц兘'; // 姝e父鏁版嵁鏃舵病鏈夋爣棰�
+            option.xAxis.data = chartData.map(item => item.鏃ユ湡); // 璁剧疆x杞存暟鎹�
+            option.series[0].data = chartData.map(item => item['鐢熶骇鎬绘暟']); // 璁剧疆y杞存暟鎹�
+
+            option.series[0].label = {
+                normal: {
+                    show: true,
+                    position: 'top',
+                    formatter: function (params) {
+                        return echarts.format.addCommas(params.value);
+                    }
+                }
+            };
+
+            option.series[0].itemStyle = {
+                normal: {
+                    color: '#15b1fa',
+                    label: {
+                        show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+                    }
+                }
+            };
+        } else {
+            // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+            option.title.text = '鏆傛棤鏁版嵁';
+        }
+
+        // 鏇存柊鍥捐〃
+        mychart11.setOption(option);
+    }
+
+    //鎶樼嚎鍥�
+    function get_LineChart(mychart22, chartData1) {
+        // 榛樿鐨刼ption缁撴瀯
+        var option = {
+            title: {
+                text: '涓嶈壇鍘熷洜', // 榛樿鏍囬涓虹┖
+                left: 'center',
+                top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                textStyle: {
+                    fontSize: 18,
+                    color: '#ff0000'
+                }
+            },
+            axisLabel: {
+                show: true,
+                interval: 0,
+                color: '#15b1fa',
+                formatter: function (value) {
+                    var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+                    var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
+                    var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+                    var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+                    if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+                    {
+                        for (var i = 0; i < rowN; i++) {
+                            var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
+                            var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
+                            var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
+                            //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+                            temp = value.substring(start, end) + "\n";
+                            ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+                        }
+                        return ret;
+                    }
+                    else {
+                        return value;
+                    }
+                }
+            },
+            grid: {
+                top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                bottom: '20%',
+                left: '10%',
+                right: '10%'
+            },
+            xAxis: {
+                type: 'category',
+                data: [] // 榛樿x杞存暟鎹负绌�
+            },
+            yAxis: {
+                type: 'value'
+            },
+            series: [
+                {
+                    data: [], // 榛樿series鏁版嵁涓虹┖
+                    type: 'line', // 灏嗘煴鐘跺浘鏀逛负鎶樼嚎鍥�
+                    smooth: true, // 浣挎姌绾垮浘骞虫粦
+                    lineStyle: {
+                        color: '#15b1fa' // 璁剧疆绾挎潯棰滆壊
+                    },
+                    label: {
+                        show: true, // 鍦ㄦ姌绾垮浘涓婃樉绀烘暟鎹�
+                        position: 'top',
+                        formatter: function (params) {
+                            return echarts.format.addCommas(params.value);
+                        }
+                    }
+                }
+            ]
+        };
+
+        // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+        if (chartData1 && chartData1.length > 0) {
+            option.title.text = '涓嶈壇鍘熷洜'; // 姝e父鏁版嵁鏃舵病鏈夋爣棰�
+            option.xAxis.data = chartData1.map(item => item.涓嶈壇鍘熷洜); // 璁剧疆x杞存暟鎹�
+            option.series[0].data = chartData1.map(item => item['鏁伴噺']); // 璁剧疆y杞存暟鎹�
+        } else {
+            // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+            option.title.text = '鏆傛棤鏁版嵁';
+        }
+
+        mychart22.setOption(option);
+    }
+
+    //楗煎浘
+    function get_Statistics(mychart3, chartData2) {
+        // 濡傛灉 chartData2 涓虹┖锛屾彁渚涗竴涓�滄棤鏁版嵁鈥濇彁绀�
+        if (chartData2.length === 0) {
+            mychart3.setOption({
+                title: {
+                    text: '鏆傛棤鏁版嵁',
+                    left: 'center',
+                    top: '10%',
+                    textStyle: {
+                        color: 'red', // 璁剧疆鏍囬棰滆壊涓虹孩鑹�
+                        fontSize: 18,
+                        fontWeight: 'bold'
+                    }
+                },
+                series: [],  // 娓呯┖鏁版嵁
+                graphic: []  // 娓呯┖鍥惧舰涓殑鏂囨湰
+            });
+            return;
+        }
+
+        // 鐘舵�侀鑹叉槧灏�
+        const statusColorMap = {
+            '寮�鏈�': '#28a745',    // 缁胯壊
+            '鏁呴殰': '#ff63a5',    // 妗冪孩鑹�
+            '鍋滄満': '#f0ad4e',    // 榛勮壊
+            '鏈煡': '#6c757d'     // 鐏拌壊
+        };
+
+        // 璁$畻寮�鏈虹巼
+        const totalDevices = chartData2.reduce((sum, item) => sum + item.鏁伴噺, 0);
+        const onlineDevices = chartData2.find(item => item.鐘舵�� === '寮�鏈�')?.鏁伴噺 || 0;
+        const onlineRate = totalDevices === 0 ? 0 : (onlineDevices / totalDevices * 100).toFixed(2);
+
+        // 鍔ㄦ�佺敓鎴愰ゼ鍥炬暟鎹紝骞舵牴鎹姸鎬佽缃鑹�
+        var data = chartData2.map(function (item) {
+            // 鑾峰彇褰撳墠鐘舵�佺殑棰滆壊锛岄粯璁や负鐏拌壊
+            var color = statusColorMap[item.鐘舵�乚 || statusColorMap['鏈煡'];
+
+            return {
+                value: item.鏁伴噺,
+                name: item.鐘舵��,
+                itemStyle: {
+                    color: color  // 涓烘瘡涓姸鎬佽缃搴旂殑棰滆壊
+                }
+            };
+        });
+
+        // 鍥捐〃鐨勯厤缃」
+        var option = {
+            title: {
+                text: '璁惧鐘舵�佸垎鏋愬姣�',
+                left: 'center',
+                top: '10%',  // 灏嗘爣棰樻斁缃埌椤堕儴
+                textStyle: {
+                    color: 'red',  // 璁剧疆鏍囬瀛椾綋棰滆壊涓虹孩鑹�
+                    fontSize: 18,
+                    fontWeight: 'bold'
+                }
+            },
+            tooltip: {
+                trigger: 'item'
+            },
+            legend: {
+                orient: 'vertical',
+                left: 'left'
+            },
+            series: [
+                {
+                    name: '璁惧鐘舵��',
+                    type: 'pie',
+                    radius: '50%',
+                    data: data,  // 浣跨敤鍔ㄦ�佺敓鎴愮殑鏁版嵁
+                    emphasis: {
+                        itemStyle: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                }
+            ],
+            graphic: [{
+                type: 'text',
+                left: 'center',
+                top: '85%',  // 璋冩暣鏂囨湰浣嶇疆锛岃鍏剁◢寰洿寰�涓�
+                style: {
+                    text: `寮�鏈虹巼: ${onlineRate}%`,  // 鏄剧ず寮�鏈虹巼
+                    font: '16px Arial',
+                    fill: '#00aaff'  // 浣跨敤娴呰摑鑹叉樉绀哄紑鏈虹巼
+                }
+            }]
+        };
+
+        // 璁剧疆鍥捐〃鐨勯厤缃」
+        mychart3.setOption(option);
+    }
+
+    //鏌辩姸鍥�4
+    function get_Histogram4(mychart4, chartData3) {
+        // 榛樿鐨刼ption缁撴瀯
+        var option = {
+            title: {
+                text: '缁翠慨', // 榛樿鏍囬涓虹┖
+                left: 'center',
+                top: '10%', // 璋冩暣鏍囬浣嶇疆锛屾斁鍒版渶涓婇潰
+                textStyle: {
+                    fontSize: 18,
+                    color: '#ff0000'
+                }
+            },
+            axisLabel: {
+                show: true,
+                interval: 0,
+                color: '#15b1fa',
+                formatter: function (value) {
+                    var ret = "";//鎷兼帴鍔燶n杩斿洖鐨勭被鐩」
+                    var maxLength = 1;//姣忛」鏄剧ず鏂囧瓧涓暟
+                    var valLength = value.length;//X杞寸被鐩」鐨勬枃瀛椾釜鏁�
+                    var rowN = Math.ceil(valLength / maxLength); //绫荤洰椤归渶瑕佹崲琛岀殑琛屾暟
+                    if (rowN > 1)//濡傛灉绫荤洰椤圭殑鏂囧瓧澶т簬3,
+                    {
+                        for (var i = 0; i < rowN; i++) {
+                            var temp = "";//姣忔鎴彇鐨勫瓧绗︿覆
+                            var start = i * maxLength;//寮�濮嬫埅鍙栫殑浣嶇疆
+                            var end = start + maxLength;//缁撴潫鎴彇鐨勪綅缃�
+                            //杩欓噷涔熷彲浠ュ姞涓�涓槸鍚︽槸鏈�鍚庝竴琛岀殑鍒ゆ柇锛屼絾鏄笉鍔犱篃娌℃湁褰卞搷锛岄偅灏变笉鍔犲惂
+                            temp = value.substring(start, end) + "\n";
+                            ret += temp; //鍑�熸渶缁堢殑瀛楃涓�
+                        }
+                        return ret;
+                    }
+                    else {
+                        return value;
+                    }
+                }
+            },
+            grid: {
+                top: '25%', // 璋冩暣grid鐨則op鍊硷紝缁欐爣棰樼暀鍑虹┖闂�
+                bottom: '20%',
+                left: '10%',
+                right: '10%'
+            },
+            xAxis: {
+                type: 'category',
+                data: [] // 榛樿x杞存暟鎹负绌�
+            },
+            yAxis: {
+                type: 'value'
+            },
+            series: [
+                {
+                    data: [], // 榛樿series鏁版嵁涓虹┖
+                    type: 'bar'
+                }
+            ]
+        };
+
+        // 濡傛灉鏈夋暟鎹紝鏇存柊option鐨勫唴瀹�
+        if (chartData3 && chartData3.length > 0) {
+            option.title.text = '缁翠慨'; // 姝e父鏁版嵁鏃舵病鏈夋爣棰�
+            option.xAxis.data = chartData3.map(item => item.缁翠慨椤圭洰); // 璁剧疆x杞存暟鎹�
+            option.series[0].data = chartData3.map(item => item['缁翠慨娆℃暟']); // 璁剧疆y杞存暟鎹�
+
+            option.series[0].label = {
+                normal: {
+                    show: true,
+                    position: 'top',
+                    formatter: function (params) {
+                        return echarts.format.addCommas(params.value);
+                    }
+                }
+            };
+
+            option.series[0].itemStyle = {
+                normal: {
+                    color: '#15b1fa',
+                    label: {
+                        show: true // 鍦ㄦ煴鐘跺浘涓婃樉绀烘暟鎹�
+                    }
+                }
+            };
+        } else {
+            // 娌℃湁鏁版嵁鏃讹紝鏄剧ず"鏆傛棤鏁版嵁"鎻愮ず
+            option.title.text = '鏆傛棤鏁版嵁';
+        }
+
+        // 鏇存柊鍥捐〃
+        mychart4.setOption(option);
+    }
+
+
+
+    //#region   鎿嶄綔鍙版寜閽偣鍑讳簨浠�
+
+    //寮�鏈烘寜閽偣鍑讳簨浠�
+    function PowerOn(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏂板寮�鏈哄崟',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../璁惧绠$悊/璁惧寮�鏈哄崟/Sb_EquipBeginBill.html?OperationType=1&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+            },
+        });
+    }
+
+    //鍋滄満鎸夐挳鐐瑰嚮浜嬩欢
+    function PowerOff(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏂板鍋滄満鍗�',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../璁惧绠$悊/璁惧鍋滄満鍗�/Sb_EquipStopBill.html?OperationType=1&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+            },
+        });
+    }
+
+    //鐐规璁板綍鎸夐挳鐐瑰嚮浜嬩欢
+    function DotCheck(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏌ョ湅璁惧鏈堢偣妫�璁板綍',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../杞﹂棿绠$悊/鍚姩鐐规鍗�/Sc_WorkDotCheckBillList_Day.html?OperationType=璁惧&linterid=' + HEquipID + '',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID,
+                    "HEquipType": "璁惧"
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+
+            },
+        });
+    }
+
+    //鏁呴殰鐧昏鎸夐挳鐐瑰嚮浜嬩欢
+    function FaultRegistration(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏂板鏁呴殰鐧昏鍗�',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../璁惧绠$悊/Sb_Add_EqpConkBookBillList.html?OperationType=1&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+            },
+        });
+    }
+
+    //缁翠慨璁板綍鎸夐挳鐐瑰嚮浜嬩欢
+    function Maintenance(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏂板缁翠慨璁板綍鍗�',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html?OperationType=1&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+            },
+        });
+    }
+
+    //灞ュ巻鎸夐挳鐐瑰嚮浜嬩欢
+    function Resume(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏌ョ湅璁惧灞ュ巻',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../璁惧绠$悊/璁惧鎶ヨ〃/Sb_EquipResumeCheckQuery.html?OperationType=1&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID,
+                    "HEquipNumber": HEquipNumber,
+                    "HEquipName": HEquipName
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+            },
+        });
+    }
+
+    //宸ヨ壓鎸夐挳鐐瑰嚮浜嬩欢
+    function Process(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../鐢熶骇绠$悊/璁㈠崟鐘舵�佸垎甯�/Sc_EquipmentProcessList.html?OperationType=4&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipID": HEquipID,
+                    "HICMOInterID": HICMOInterID,
+                    "HICMOEntryID": HICMOEntryID
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+
+            },
+        });
+    }
+
+    //鐘舵�佹寜閽偣鍑讳簨浠�
+    function HStatus(event, obj) {
+        if (wktag == 0) {
+            layer.alert("璇烽�夋嫨瀵瑰簲璁惧", { icon: 5 });
+            return false;
+        }
+        layer.open({
+            type: 2,
+            skin: 'layui-layer-rim', //鍔犱笂杈规
+            title: '鏌ョ湅璁惧OEE',
+            closeBtn: 1,
+            shift: 2,
+            area: ['100%', '100%'],
+            maxmin: true,
+            content: '../../鐢熶骇绠$悊/璁㈠崟鐘舵�佸垎甯�/Sc_OEEStatusReport.html?OperationType=4&linterid=0&HSouceBillType=',
+            end: function () {
+
+            },
+            success: function (dom, index) {
+                var data = [];
+                data.push({
+                    "HEquipNumber": HEquipNumber
+                });
+
+                //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+                var iframe = window['layui-layer-iframe' + index];
+                //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+                iframe.edit(data);
+
+            },
+        });
+    }
+
+
+    //#endregion
+
 </script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index d6672cf..185225d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -127,13 +127,13 @@
                                                 <div class="layui-input-block" style="margin-left: 120px;width:180px">
                                                     <select name="HLev" id="HLev" lay-filter="HLev">
                                                         <option value="鏅��" selected="">鏅��</option>
-                                                        <option value="閲嶈" >閲嶈</option>
+                                                        <option value="閲嶈">閲嶈</option>
                                                         <option value="绱ф��">绱ф��</option>
                                                     </select>
                                                 </div>
-                                            </div>                                           
+                                            </div>
                                         </div>
-                                        <div class="layui-form-item">     
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鏁呴殰鍘熷洜鍒嗘瀽鍙婇闃叉帾鏂�</label>
                                                 <div class="layui-input-inline" style="width:300px;">
@@ -184,8 +184,14 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         var OptionData = [];
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+        }
         //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
@@ -200,8 +206,13 @@
 
 
 
+        //鑾峰彇鍙傛暟
         var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
+        var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+        var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+        var HEntryID = params[params[3]]; //瀛愬唴鐮�
+        var HSouceBillType = params[params[2]]; //婧愬崟绫诲瀷
+
 
 
         layui.config({
@@ -265,7 +276,7 @@
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
             //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
+            if (OperationType == null || OperationType == 1) {
                 $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍙戠幇浜篒D
                 $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍙戠幇浜�
                 $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
@@ -273,20 +284,40 @@
                 $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
                 $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
 
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3907' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HInterID").val(0);
+                    }
+                });
+
+                if (HEquipID != "") {
+                    GetHEquip();
+                }
+
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "  ", "HConkExplanation": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "  " }];
                 table.render(option);
             }
             else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                RoadBillMain(linterid);
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
                     url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListProjectDetai',
                     type: "GET",
-                    data: { "sqlWhere": "and hmainid=" + hID },
+                    data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         console.log(result);
-                        //console.log('gouba' + result);
                         if (result.count == 1) {
                             option.data = result.data;
                             table.render(option);
@@ -304,8 +335,6 @@
 
 
             //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
@@ -469,22 +498,22 @@
             });
 
 
-
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
+            //缂栬緫
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
                     url: GetWEBURL() + "Sb_EqpRepairWorkBill/Sb_EqpConkBookBillListCheckDetai",
                     type: "GET",
                     data: {
-                        "HID": hID
+                        "HID": linterid
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data.h_v_Sb_EquipConkBookBillList_Edit[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HDate": Format(data.鏃ユ湡)
                                 , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
                                 , "HDeptID": data.HDeptID                 //浣跨敤閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О              //浣跨敤閮ㄩ棬鍚嶇О
@@ -496,7 +525,7 @@
                                 , "HEquipName": data.璁惧鍚嶇О             //璁惧鍚嶇О
                                 , "HConkTypeID": data.HConkTypeID            //鏁呴殰绫诲埆ID
                                 , "HConkTypeName": data.鏁呴殰绫诲埆          //鏁呴殰绫诲埆
-                                , "HConkBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //鏁呴殰鍙戠敓鏃ユ湡
+                                , "HConkBeginDate": Format(data.鍙戠敓鏃ユ湡) //鏁呴殰鍙戠敓鏃ユ湡
                                 , "HExplanation": data.鏁呴殰鎻忚堪           //鎽樿
                                 , "HLev": data.绱ф�ョ▼搴�                //澶囨敞
                                 , "HReason": data.鏁呴殰鍘熷洜鍒嗘瀽鍙婇闃叉帾鏂�                //澶囨敞
@@ -512,37 +541,7 @@
                     }
                 });
             }
-
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3907' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HConkBeginDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
-
+           
             //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -733,9 +732,6 @@
                 });
             });
 
-
-
-
             form.on('submit(Exit)', function (data) {//
                 if (params[params[0]] == undefined) {
                     //鍏抽棴椤电
@@ -747,30 +743,11 @@
                 }
             });
 
-
-
-
-
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
             })
-
-            function formatDate(date) {
-                var d = new Date(date),
-                    month = '' + (d.getMonth() + 1),
-                    day = '' + d.getDate(),
-                    year = d.getFullYear();
-
-                if (month.length < 2) month = '0' + month;
-                if (day.length < 2) day = '0' + day;
-
-                return [year, month, day].join('-');
-            }
-            //console.log(rTime('2021-06-03T08:35:57.697'));
-            //var startDate = new Date("2019-04-30 16:30:30").toLocaleDateString().split('/').join('-');
-            //console.log(startDate);
 
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
@@ -809,10 +786,29 @@
                         });
                 }
             });
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
             }
+
+            //#region 鑾峰彇浼犲叆鐨勪俊鎭洖鏄鹃〉闈�
+            function GetHEquip() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_EquipFileMain/get锘縎b_EquipList",
+                    type: "GET",
+                    data: { "HInterID": HEquipID, "user": sessionStorage["HUserName"], },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HEquipID").val(result.data[0].hmainid);
+                            $("#HEquipName").val(result.data[0].璁惧鍚嶇О);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }
+                });
+            }
+            //#endregion
 
             //鐩戝惉鎻愪氦
             form.verify({
@@ -828,7 +824,7 @@
 
         });
         //杩斿洖閮ㄩ棬
-        function GetHDeptNameValue(obj) {  
+        function GetHDeptNameValue(obj) {
             $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
             $("#HDeptID").val(obj[0].HItemID);
         }
@@ -843,7 +839,7 @@
             $("#HManagerID").val(obj[0].HItemID);
         }
         //杩斿洖璁惧
-        function GetEquipFileValue(obj) {  
+        function GetEquipFileValue(obj) {
             $("#HEquipName").val(obj[0].璁惧鍚嶇О);
             $("#HEquipID").val(obj[0].hmainid);
         }
@@ -877,7 +873,7 @@
         //    $("#HProcID").val(obj[0].HItemID);
         //    $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
         //}
-      
+
         ////杩斿洖鍗曚綅
         //function GetHUnitNameValue(obj) {
         //    $("#HUName").val(obj[0].璁¢噺鍗曚綅鍚嶇О);
@@ -885,7 +881,7 @@
         //    $("#HUnitNumber").val(obj[0].璁¢噺鍗曚綅浠g爜);
         //}
 
-       
+
         ////function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
         ////    SQProcName = obj[0].宸ュ簭;
         ////    ProcID = obj[0].HItemID;
@@ -953,7 +949,7 @@
                 return true;
             }
         }
-    
+
     </script>
 </body>
 </html>
\ No newline at end of file
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 eec789e..d5a3602 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"
@@ -282,6 +282,11 @@
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/PubCustom.js"></script>
     <script>
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+        }
         var OptionData = [];
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
@@ -310,7 +315,6 @@
             var option;//缁翠慨淇℃伅
             var option1 = [];//閰嶄欢
             var sBillType = "3910";
-            //var TabRow = { "HRepairID1": 0, "HRepairCode": "", "HRepairName": "", "HManagerID1": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -872,6 +876,9 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
+                if (HEquipID != "") {
+                    GetHEquip();
+                }
                 option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRepairExplanation": "", "HRemark": ""/*, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " "*/ }];
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
                 table.render(option);
@@ -1434,6 +1441,30 @@
                 return true;
             }
 
+            //#region 鑾峰彇浼犲叆鐨勪俊鎭洖鏄鹃〉闈�
+            function GetHEquip() {
+                $.ajax({
+                    url: GetWEBURL() + "/Sb_EqpRepairWorkBill/Get_XT_EqpConkBookList",
+                    type: "GET",
+                    data: { "HInterID": HEquipID, "user": sessionStorage["HUserName"], },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HEquipID").val(result.data[0].hmainid);
+                            $("#HEquipName").val(result.data[0].璁惧鍚嶇О);
+                            $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
+                            $("#HMainSourceInterID").val(result.data[0].hmainid);
+                            $("#HMainSourceEntryID").val(result.data[0].hsubid);
+                            $("#HRepairCategory").val(result.data[0].鏁呴殰绫诲埆);
+                            $("#HRepairer").val(result.data[0].鍙戠幇浜�);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }
+                });
+            }
+            //#endregion
+
+
             //#endregion
 
         });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index f16ab07..7f19d83 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -346,7 +346,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../璁惧绠$悊/Sb_Add_EqpConkBookBillList.html?hID=0',
+                            content: '../璁惧绠$悊/Sb_Add_EqpConkBookBillList.html?OperationType=1&hID=0',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -370,7 +370,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_Add_EqpConkBookBillList.html?hID=' + hID
+                                , content: '../璁惧绠$悊/Sb_Add_EqpConkBookBillList.html?OperationType=3&hID=' + hID
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html"
index 2246235..aa8a6e3 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill.html"
@@ -222,7 +222,11 @@
     </div>
 
     <script>
-
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -278,7 +282,12 @@
                 $("#HStopTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                 //鍒濆鍖栨棩鏈�
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+                //鍒濆鍖栧仠鏈轰汉
+                $("#HStopEmpName").val(sessionStorage["HUserName"]);
+                $("#HStopEmpID").val(sessionStorage["HEmpID"]);
+                if (HEquipID != "") {
+                    GetHEquip();
+                }
             }
             else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new     
 
@@ -585,6 +594,26 @@
                 return true;
             }
             //#endregion      
+
+            //#region 鑾峰彇浼犲叆鐨勪俊鎭洖鏄鹃〉闈�
+            function GetHEquip() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_EquipFileMain/get锘縎b_EquipList",
+                    type: "GET",
+                    data: { "HInterID": HEquipID, "user": sessionStorage["HUserName"], },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HEquipID").val(result.data[0].hmainid);
+                            $("#HEquipName").val(result.data[0].璁惧鍚嶇О);
+                            $("#HEquipRelationID").val(result.data[0].HMainSourceID);
+                            $("#HEquipRelationName").val(result.data[0].鎵�灞炰富鐢熶骇璁惧);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }
+                });
+            }
+            //#endregion
             //#endregion
         });
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html"
index 72aa038..c43b604 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBillList.html"
@@ -153,6 +153,7 @@
                         <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -203,7 +204,7 @@
             var page = 1;//鍒嗛〉鏁版嵁
             var size = 50;
             var HModName = "Sb_EquipStopBillList";
-
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "3918";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -241,6 +242,9 @@
 
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鏂板
                     case 'set_AddNew': set_AddNew();
                         break;
@@ -437,6 +441,7 @@
                             option.cols = [col];
                             option.data = data1.data;
                             table.render(option);
+                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -512,6 +517,7 @@
                             option.data = data1.data;
                             option.totalRow = true;
                             laypage.render(optionPage);
+                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -654,6 +660,12 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //#region 鏂板
             function set_AddNew() {
                 layer.open({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html"
index 474ca79..fc809c8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBill.html"
@@ -217,7 +217,11 @@
     </div>
 
     <script>
-
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -259,6 +263,7 @@
                 }, function () { window.location.href = "../../user/login.html"; });
             }
             //#endregion
+
             //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
             if (OperationType == null || OperationType == 1) {                            //鏂板
           
@@ -273,8 +278,13 @@
                 $("#HBeginTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                 //鍒濆鍖栨棩鏈�
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-
-            }
+                //鍒濆鍖栧紑鏈轰汉
+                $("#HBeginEmpName").val(sessionStorage["HUserName"]);
+                $("#HBeginEmpID").val(sessionStorage["HEmpID"]);
+                if (HEquipID!="") {
+                    GetHEquip();
+                }
+            }            
             else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new     
 
                 //鍒濆鍖栭」鐩樁娈佃〃
@@ -362,6 +372,26 @@
             }
             //#endregion
 
+            //#region 鑾峰彇浼犲叆鐨勪俊鎭洖鏄鹃〉闈�
+            function GetHEquip() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_EquipFileMain/get锘縎b_EquipList",
+                    type: "GET",
+                    data: { "HInterID": HEquipID, "user": sessionStorage["HUserName"], },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HEquipID").val(result.data[0].hmainid);
+                            $("#HEquipName").val(result.data[0].璁惧鍚嶇О);
+                            $("#HEquipRelationID").val(result.data[0].HMainSourceID);
+                            $("#HEquipRelationName").val(result.data[0].鎵�灞炰富鐢熶骇璁惧);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }                       
+                    }
+                });
+            }
+            //#endregion
+
             //#region 璁惧閫夋嫨椤甸潰
             function get_checkSearchHEquip() {
                 layer.open({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html"
index ff956db..e8d3cdf 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\274\200\346\234\272\345\215\225/Sb_EquipBeginBillList.html"
@@ -152,6 +152,7 @@
                         <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -202,7 +203,7 @@
             var page = 1;//鍒嗛〉鏁版嵁
             var size = 50;
             var HModName = "Sb_EquipBeginBillList";
-
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "3918";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -240,6 +241,9 @@
 
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
                     //鏂板
                     case 'set_AddNew': set_AddNew();
                         break;
@@ -436,6 +440,7 @@
                             option.cols = [col];
                             option.data = data1.data;
                             table.render(option);
+                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -511,6 +516,7 @@
                             option.data = data1.data;
                             option.totalRow = true;
                             laypage.render(optionPage);
+                            ins = table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
 
@@ -656,6 +662,12 @@
             }
             //#endregion
 
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
             //#region 鏂板
             function set_AddNew() {
                 layer.open({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
index 8a2c40c..b699816 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipResumeCheckQuery.html"
@@ -37,7 +37,7 @@
                             <div class="layui-col-xs2 layui-inline" style="">
                                 <div id="TreeTable" class="demo-tree demo-tree-box" style=""></div>
                             </div>
-                            <div class="layui-col-xs3 layui-inline" style="padding-left: 10px;">
+                            <div class="layui-col-xs4 layui-inline" style="padding-left: 10px;">
                                 <div class="layui-collapse">
                                     <div class="layui-colla-item">
                                         <div class="layui-inline">
@@ -63,7 +63,7 @@
                                     <table class="" id="mainTable" lay-filter="mainTable"></table>
                                 </div>
                             </div>
-                            <div class="layui-col-xs7 layui-inline">
+                            <div class="layui-col-xs6 layui-inline">
                                 <table class="" id="mainTableResume" lay-filter="mainTableResume"></table>
                             </div>
                         </div>
@@ -80,6 +80,15 @@
         </div>
     </div>
     <script>
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var HEquipNumber = "";  //璁惧缂栫爜
+        var HEquipName = "";  //璁惧鍚嶇О
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+            HEquipNumber = data[0].HEquipNumber;
+            HEquipName = data[0].HEquipName;
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -178,7 +187,13 @@
                     $("#HName").val(HName);
                     get_FastQuery();
                     get_DisplayResume(linterid)
-                } else {
+                } else if (OperationType == 1) {
+                    $("#HNumber").val(HEquipNumber);
+                    $("#HName").val(HEquipName);
+                    get_FastQuery();
+                    get_DisplayResume(HEquipID)
+                }
+                else {
                     //鏌ヨ
                     get_Display(sWhere);
                 }
@@ -497,7 +512,7 @@
 
             //閫�鍑�
             function get_Exit() {
-                if (OperationType != 3) {
+                if (OperationType != 3 || OperationType != 1) {
                     Pub_Close(2);
                 } else {
                     Pub_Close(1);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
index c9692b9..0a32f5d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\256\211\347\201\257\351\200\220\347\272\247\345\221\274\345\217\253\350\247\204\345\210\231/OA_AndengFlowRuleBillMain.html"
@@ -584,7 +584,7 @@
                         , { field: 'HDutyName', title: '鑱屽姟鍚嶇О', edit: 'text', event: "HDutyName", style: 'background-color: #f9f9f9;' } //f7
                         , { field: 'HTimes', title: '瑙﹀彂鏃堕棿', edit: 'text', style: 'background-color: #f9f9f9;', }
                         , { field: 'HReceiveType', title: '鎺ユ敹妯″紡', style: 'background-color: #f9f9f9;', templet: '#HReceiveType' }
-                        , { field: 'HIsRece', title: '瀹屾垚鏍囪', templet: "#HIsRece" }//checkbox
+                        , { field: 'HIsRece', title: '鏄惁鎺ュ彈', templet: "#HIsRece" }//checkbox
                         , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                         , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }     //f7
                         , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }     //f7
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html"
index dc9bd5f..90452b5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkDotCheckBillList_Day.html"
@@ -40,6 +40,14 @@
     </div>
 
     <script>
+        //鑾峰彇鍙傛暟
+        var HEquipID = "";  //璁惧id
+        var HEquipType = "";  //璁惧绫诲瀷
+      
+        var edit = function (data) {
+            HEquipID = data[0].HEquipID;
+            HEquipType = data[0].HEquipType;
+        };
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 81ee0fd..8f1c02f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -2228,29 +2228,31 @@
             }
 
             //鑾峰彇鐝
-            function get_HWorkShift(HDeptID) {               
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    data: {
-                        "HDeptID": HDeptID,
-                        "HCenterID": $("#HCenterID").val()
-                    },
-                    success: function (data) {
-                        if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                        {
-                            var LoadData = data.data;
-                            $("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
-                            $("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
+            function get_HWorkShift(HDeptID) {
+                if (HDeptID!="") {
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_ShiftsController/Get_HWorkShift", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: {
+                            "HDeptID": HDeptID,
+                            "HCenterID": $("#HCenterID").val()
+                        },
+                        success: function (data) {
+                            if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            {
+                                var LoadData = data.data;
+                                $("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
+                                $("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 });
                         }
-                        else {
-                            layer.alert(data.Message, { icon: 5 });
-                        }
-                    },
-                    error: function (err) {
-                        layer.alert(err, { icon: 5 });
-                    }
-                });
+                    });
+                }               
             }
 
 
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 95a0478..0be2646 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -21,7 +21,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
-
+    <script src="../../../layuiadmin/SetColumn.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -112,6 +112,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MoneyDeAudit" id="MoneyDeAudit"><i class="layui-icon layui-icon-circle"></i>璐圭敤鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
@@ -217,6 +218,10 @@
                     //鍙嶅鏍告寜閽�
                     case 'btn-DeAudit':
                         set_CheckBill(2);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-MoneyDeAudit':
+                        set_CheckMoneyBill("UnCheck");
                         break;
                     //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
                     case 'btn-Close':
@@ -766,6 +771,42 @@
             }
             //#endregion
 
+            //#region 璐圭敤鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckMoneyBill(type) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/PM_ProjectBill/AuditTaskMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": type, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
             //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
             function set_CloseBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
new file mode 100644
index 0000000..82a378f
--- /dev/null
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -0,0 +1,629 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>椤圭洰璐圭敤寰呭鏍稿垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <style type="text/css">
+    </style>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="">
+                <div class="layui-card-body" style="padding:1px">
+                    <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                        <div>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                        </div>
+                        
+                        <div class="layui-col-xs6">
+                            <div class="layui-tab layui-tab-card" lay-filter="table">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">寰呭鏍稿垪琛�</li>
+                                </ul>
+                                <div class="layui-tab-content" style="padding:0px;">
+                                    <div class="layui-tab-item layui-show">
+                                        <table class="" id="mainTableNeedCheck" lay-filter="mainTableNeedCheck"></table>
+                                        <script type="text/html" id="toolbarDemoNeedCheck">
+                                            <div class="layui-btn-container">
+                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                            </div>
+                                        </script>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-col-xs6">
+                            <div class="layui-tab layui-tab-card" lay-filter="table">
+                                <ul class="layui-tab-title">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content" style="padding:0px;">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item" style="padding-top: 10px; background-color: white" lay-filter="">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly>
+                                                        <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                                        <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">椤圭洰浠g爜</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">椤圭洰鍚嶇О</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+                                                        <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;">
+                                                            瀹℃牳
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px;">
+                                                            瀹℃牳
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px;">
+                                                            瀹℃牳
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" readonly>
+                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px;">
+                                                            瀹℃牳
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">浠诲姟鏉愭枡璐�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" readonly>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
+                                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                                <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
+                                                <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
+                                            </ul>
+                                            <div class="layui-tab-content">
+                                                <!--椤圭洰闃舵-->
+                                                <div class="layui-tab-item layui-show">
+                                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                                </div>
+                                                <!--椤圭洰鎴愬憳-->
+                                                <div class="layui-tab-item">
+                                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--閲岀▼纰�-->
+    <script type="text/html" id="HIsKey">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HIsKey" lay-filter="HIsKey" id="HIsKey{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+    <!--椤圭洰缁忕悊-->
+    <script type="text/html" id="HIsPM">
+        <div class="layui-input-block" style="margin-left: 20px;">
+            <input type="checkbox" name="HIsPM" lay-filter="HIsPM" id="HIsPM{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+        </div>
+    </script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+             //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+
+            var option = [];
+            var optionNeedCheck = [];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+                "HFeedback", "HPriority", "HUserID", "甯佸埆浠g爜", "閲囪喘鏂瑰紡浠g爜", "缁撶畻鏂瑰紡浠g爜", "閮ㄩ棬浠g爜", "涓荤浠g爜", "涓氬姟鍛樹唬鐮�", "璁¢噺鍗曚綅浠g爜", "HCheckFlowStatusID", "HCheckFlowID","HCheckItemID"];
+            //#endregion
+            //#endregion
+            var HModName = "PM_ProjectTaskNeedCheckQuery";
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鏌ヨ
+            get_Display();
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+            //#region澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTableNeedCheck)', function (obj) {
+                switch (obj.event) {
+                    ////缂栬緫
+                    //case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
+                    //    break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Display();
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        optionNeedCheck.data.forEach((item) => {
+                            for (let itemobj in item) {
+                                if (item[itemobj] == null) {
+                                    item[itemobj] = "";
+                                }
+                                if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                                    item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                }
+                            }
+                        });
+                        table.exportFile(ins.config.id, optionNeedCheck.data, "xls");
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_Display);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                Pub_Close(2);
+            });
+            //#endregion
+            
+            
+            //#region 瀹℃牳
+            form.on('submit(btnCheckSetupMoney)', function (data) {
+                set_CheckBill("SetupMoneyCheck");
+                $('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+            });
+            form.on('submit(btnCheckOtherMoney)', function (data) {
+                set_CheckBill("OtherMoneyCheck")
+                $('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+            });
+            form.on('submit(btnCheckExamMoney)', function (data) {
+                set_CheckBill("ExamMoneyCheck")
+                $('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+            });
+            form.on('submit(btnCheckWorkMoney)', function (data) {
+                set_CheckBill("WorkMoneyCheck")
+                $('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTableNeedCheck)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+                //鏄剧ず椤圭洰淇℃伅
+                RoadBillMain(obj.data["HInterID"]);
+            })
+            //#endregion
+
+            //#region 鎺掑簭
+            table.on('sort(mainTableNeedCheck)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTableNeedCheck', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                optionNeedCheck.data = layui.table.cache["mainTableNeedCheck"];
+                table.render(optionNeedCheck);
+            });
+            //#endregion
+            //鍗曟嵁鍙疯秴閾炬帴
+            table.on('tool(mainTableNeedCheck)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var linterid = data.HInterID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫閲囪喘璁㈠崟'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+                        , resize: false,
+                        end: function () {
+
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+
+
+
+            //#endregion
+
+            //#region 璇ラ〉闈㈡墍鏈夋柟娉�
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //璁剧疆瀹℃牳鎸夐挳涓嶅彲鐐瑰嚮
+                $('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                $('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                $('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                $('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+
+                optionNeedCheck = {
+                    elem: '#mainTableNeedCheck'
+                    , toolbar: '#toolbarDemoNeedCheck'
+                    , totalRow: true
+                    , page: true
+                    , cellMinWidth: 120
+                    , height: 'full-120'
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , data : []
+                };
+
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    //, page: true
+                    //, limit: 500
+                    //, limits: [50, 500, 5000, 50000]
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [[
+                        //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+                        , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HProjectStageName', title: '椤圭洰闃舵',  event: "HProjectStageName" }     //f7
+                        , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�',  event: "HPMGoodsName" }            //f7
+                        , { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
+                        , { field: 'HRate', title: '涓氱哗鍗犳瘮',  totalRow: true }
+                        , { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HEmpName', title: '闃舵璐熻矗浜�',  event: "HEmpName" }                    //f7
+                        , { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HCheckEmpName', title: '闃舵瀹℃牳浜�',  event: "HCheckEmpName" }          //f7
+                        , { field: 'HFinishDate', title: '棰勮瀹屾垚鏃ユ湡', event: "HFinishDate" }
+                        , { field: 'HWorkDays', title: '棰勮浜哄ぉ',  totalRow: true }
+                        , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
+                    ]]
+                }
+                var rowdata = [
+                    {
+                        "RowID": 10
+                        , 'HProjectStageID': '0'
+                        , 'HProjectStageName': ''
+                        , 'HStageNote': ''
+                        , 'HPMGoodsID': '0'
+                        , 'HPMGoodsName': ''
+                        , 'HIsKey': false
+                        , 'HRate': '0'
+                        , 'HEmpID': '0'
+                        , 'HEmpName': ''
+                        , 'HCheckEmpID': '0'
+                        , 'HCheckEmpName': ''
+                        , 'HFinishDate': ''
+                        , 'HWorkDays': '0'
+                        , 'HRemarkSub': ''
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                option1 = {
+                    elem: '#mainTable1'
+                    //, toolbar: '#toolbarDemo1'
+                    , page: false
+                    , totalRow: true
+                    , limit: 500
+                    , limits: [50, 500, 5000, 50000]
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [[
+                        //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' }                                                   //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+                        , { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HEmployeeName', title: '椤圭洰鎴愬憳',  event: "HEmployeeName" }     //f7
+                        , { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
+                        , { field: 'HRate', title: '椤圭洰鍗犳瘮',  totalRow: true }
+                        , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗',  totalRow: true }
+                        , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚',  totalRow: true }
+                        , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
+                    ]]
+                }
+                var rowdata1 = [
+                    {
+                        "RowID": 10
+                        , 'HEmployeeID': '0'
+                        , 'HEmployeeName': ''
+                        , 'HIsPM': false
+                        , 'HRate': '0'
+                        , 'HPlanAvgMoney': '0'
+                        , 'HPlanCountMoney': '0'
+                        , 'HRemarkSub': ''
+                    }
+                ];
+                option1.data = rowdata1;
+                table.render(option1);
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄦ牸
+            function get_Display() {
+                var ajaxLoad = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
+                    type: "GET",
+                    data: {"user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];//鍒楀瓧娈垫暟鎹�
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            optionNeedCheck.cols = [col];
+                            optionNeedCheck.data = data1.data;
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedCheck);
+                            ins = table.render(optionNeedCheck);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+             }
+            //#endregion
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/PM_ProjectBill/editInit",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data[0];
+                        var tableSub = result.data[1];
+                        var tableSub_Emp = result.data[2];
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": tableMain[0]["HInterID"]
+                            , "HProNumber": tableMain[0]["HProNumber"]
+                            , "HProName": tableMain[0]["HProName"]
+                            , "HBillNo": tableMain[0]["HBillNo"]
+                            , "HDate": Format(new Date(tableMain[0]["HDate"]), "yyyy-MM-dd")
+                            ,"HTaskMaterMoney": tableMain[0]["HTaskMaterMoney"],
+                            "HTaskSetupMoney": tableMain[0]["HTaskSetupMoney"],
+                            "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"],
+                            "HTaskExamMoney": tableMain[0]["HTaskExamMoney"],
+                            "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"],
+
+                        });
+                        //瀹℃牳鎸夐挳璁剧疆
+                        $('#btnCheckSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                        $('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                        $('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                        $('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+                        if (tableMain[0]["HTaskSetupMoneyCheckFlag"] == false) {
+                            $('#btnCheckSetupMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+                        }
+                        if (tableMain[0]["HTaskOtherMoneyCheckFlag"] == false) {
+                            $('#btnCheckOtherMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+                        }
+                        if (tableMain[0]["HTaskExamMoneyCheckFlag"] == false) {
+                            $('#btnCheckExamMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+                        }
+                        if (tableMain[0]["HTaskWorkMoneyCheckFlag"] == false) {
+                            $('#btnCheckWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+                        }
+                        //娓叉煋椤圭洰闃舵琛�
+                        //璁剧疆椤圭洰闃舵琛ㄥ畬鎴愭棩鏈熺殑鏍煎紡
+                        for (var i = 0; i < tableSub.length; i++) {
+                            tableSub[i]["HFinishDate"] = Format(new Date(tableSub[i]["HFinishDate"]), "yyyy-MM-dd");
+                            tableSub[i].RowID = (i + 1) * 10;
+                        }
+                        option.data = tableSub;
+                        table.render(option);
+                        //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
+                        for (var i = 0; i < tableSub.length; i++) {
+                            if (tableSub[i].HIsKey) {
+                                $('#HIsKey' + (i + 1)).attr("checked", true);
+                            }
+                        }
+                        form.render('checkbox');
+                        //娓叉煋椤圭洰鎴愬憳琛�
+                        for (var i = 0; i < tableSub_Emp.length; i++) {
+                            tableSub_Emp[i].RowID = (i + 1) * 10;
+                        }
+                        option1.data = tableSub_Emp;
+                        table.render(option1);
+                        //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
+                        for (var i = 0; i < tableSub_Emp.length; i++) {
+                            if (tableSub_Emp[i].HIsPM) {
+                                $('#HIsPM' + (i + 1)).attr("checked", true);
+                            }
+                        }
+                        form.render('checkbox');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(type) {
+                var HInterID = $("#HInterID").val();
+                if (HInterID != 0) {
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/PM_ProjectBill/AuditTaskMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "Type": type, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    get_Display();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#endregion
+
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        function formatDate(date) {
+            var d = new Date(date),
+                month = '' + (d.getMonth() + 1),
+                day = '' + d.getDate(),
+                year = d.getFullYear();
+
+            if (month.length < 2) month = '0' + month;
+            if (day.length < 2) day = '0' + day;
+
+            return [year, month, day].join('-');
+        }
+    </script>
+</body>
+</html>

--
Gitblit v1.9.1