From 791a85199fcf4a363225f9b343b4a7f7e09e3ea2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 17 五月 2023 15:28:01 +0800
Subject: [PATCH] 页面优化

---
 WebTM/views/验收入库/产品入库/Kf_ProductInBillList.html                             |   51 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html                      |  275 ++
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html                             |   77 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html                                |   40 
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html                              |    6 
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                                    |    2 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html                               |  175 +
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBill_OutList.html                         |    4 
 WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html                   |   19 
 WebTM/views/index_Office.html                                               | 1214 ++++++++++++
 WebTM/views/Baseset/SRM_OpenTmpList.html                                    |   29 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html                            |  188 -
 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html                               |    4 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillMainRates.html                          |   90 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html                      |   81 
 WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html                               |   49 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html                            |   30 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html                          |  212 -
 WebTM/views/车间管理/报表分析/Sc_EmployeePiecePaySumReport.html                     |    7 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html                                   |   59 
 WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html                               |   29 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html                             |   20 
 WebTM/views/领料发货/领料出库/Kf_StockOutRequestBillList.html                       |   69 
 WebTM/views/PublicPage/SourceInformation.html                               |    4 
 WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html                                   |   82 
 WebTM/views/车间管理/报表分析/Sc_EmployeePiecePayReport.html                        |   16 
 WebTM/WebTM.csproj                                                          |   10 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html                                  |   15 
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html                               |   85 
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html                               |    4 
 WebTM/views/user/login.html                                                 |   24 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html                             |   99 
 WebTM/views/基础资料/生产基础资料/Gy_Process.html                                     |   15 
 WebTM/views/基础资料/生产基础资料/Gy_Source.html                                      |   36 
 WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPReport.html                      |   19 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs          |   17 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html                             |    6 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html                 |  110 
 WebTM/views/home/console.html                                               |   30 
 WebTM/views/车间管理/报表分析/Sc_EmployeePieceWorkReport.html                       |   16 
 WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html                           |    4 
 WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html                              |    4 
 WebTM/views/Baseset/基础资料/Gy_MaterialList_LSQP.html                          |    2 
 WebTM/views/index.html                                                      |  475 ++--
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                                  |   14 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html                         |   98 
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html                                   |   40 
 WebTM/views/PublicPage/MaterialInfo.html                                    |   54 
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html                         |   16 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html                             |  631 ++++--
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillLists.aspx.designer.cs |   26 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillLists.aspx             |   27 
 WebTM/views/系统管理/用户管理/Gy_UserWorkCenter.html                                |  433 ++++
 WebTM/views/PublicPage/HSourceReportHtml.html                               |   98 
 WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html                             |   57 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                                   |  251 +-
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                                 |  159 
 57 files changed, 4,210 insertions(+), 1,497 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c94d01..80666c8 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -161,6 +161,7 @@
     <Content Include="views\grf\b.grf" />
     <Content Include="views\home\console_QiaoYi.html" />
     <Content Include="views\home\console_Mobile_QiaoYi.html" />
+    <Content Include="views\index_Office.html" />
     <Content Include="views\index_Mobile_QiaoYi.html" />
     <Content Include="views\index_QiaoYi.html" />
     <Content Include="views\index - 澶嶅埗.html" />
@@ -200,9 +201,11 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillLists.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_SplitBarCode.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserWorkCenter.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillMainRates.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_QiaoYi.html" />
@@ -1638,6 +1641,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
       <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs">
+      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillLists.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillLists.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillLists.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs">
       <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList.html b/WebTM/views/Baseset/SRM_OpenTmpList.html
index 95919ec..ef20a1b 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList.html
@@ -23,6 +23,7 @@
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Default">榛樿妯℃澘</button>
                                 <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">闅愯棌鍒楄缃�</button>
                             </div>
                         </div>
@@ -272,6 +273,34 @@
                 parent.layer.close(index);
             });
 
+            form.on('submit(Default)', function (data) {//璁剧疆榛樿妯℃澘
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                    var OpenTmp = data[0].妯℃澘鍚嶇О;
+                if (checkStatus.data.length == 1) {
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/DefaultOpenTmp",
+                        async: true,
+                        data: { "HNumber": Type, "HName": OpenTmp },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg('璁剧疆榛樿妯℃澘鎴愬姛!', { icon: 6, time: 2000 });
+                            } else {
+                                layer.msg('璁剧疆榛樿妯℃澘澶辫触!', { icon: 5, time: 2000 });
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                };
+            });
+
             //闅愯棌鍒楄缃�
             form.on('submit(HideColumn)', function (data) {
                 get_HideColumn();
diff --git a/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html b/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
index 900d640..9340b64 100644
--- a/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
+++ b/WebTM/views/Baseset/SRM_OpenTmpList_GXPG.html
@@ -23,6 +23,7 @@
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">閫夋嫨</button>
                                 <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Default">榛樿妯℃澘</button>
                             </div>
                         </div>
                     </div>
@@ -268,7 +269,33 @@
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
-
+            form.on('submit(Default)', function (data) {//璁剧疆榛樿妯℃澘
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                var OpenTmp = data[0].妯℃澘鍚嶇О;
+                if (checkStatus.data.length == 1) {
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/DefaultOpenTmp",
+                        async: true,
+                        data: { "HNumber": Type, "HName": OpenTmp },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg('璁剧疆榛樿妯℃澘鎴愬姛!', { icon: 6, time: 2000 });
+                            } else {
+                                layer.msg('璁剧疆榛樿妯℃澘澶辫触!', { icon: 5, time: 2000 });
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                };
+            });
 
 
         });
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html"
index 3960706..237944e 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterialList_LSQP.html"
@@ -83,7 +83,7 @@
                 var Value = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"];
 
                 if ($("#HModel").val() != null) {
-                    Value += " and HModel like '%" + $("#HModel").val() + "%'"
+                    Value += " and HModel like '%" + $("#HModel").val().replace('筛','') + "%'"
                 }
                 if ($("#HName").val() != null) {
                     Value += " and HName like '%" + $("#HName").val() + "%'"
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 769f728..f321428 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -22,12 +22,7 @@
                 <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-colla-item">                               
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -59,44 +54,37 @@
                                     <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-colla-content">
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <span>鍏朵粬鏉′欢></span>
+                                <div class="layui-row" style="margin-top:5px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="PartModel" id="PartModel" style="width:190px;">
                                         </div>
-
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鐗╂枡缂栫爜</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" 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>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">杩囨护</label>
+                                        <div class="layui-input-block">
+                                            <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                             </select>
                                         </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
-                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
                                     </div>
                                 </div>
                             </div>
@@ -368,7 +356,7 @@
             //#region 蹇�熻繃婊�
             function get_FastQuery(HSouceBillType) {
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁缂栧彿
-                var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
+                var PartModel = $("#PartModel").val();//鐗╂枡缂栫爜
                 var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
                 var HDeptName = $("#HDeptName").val();//閮ㄩ棬
                 var ColName = $("#ColName").val();//澶嶉�夋
@@ -404,8 +392,8 @@
                         if (HBillNo) {
                             sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                         }
-                        if (PartNumber) {
-                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        if (PartModel) {
+                            sWhere += " and 瑙勬牸鍨嬪彿 like '%" + PartModel + "%'";
                         }
                         if (PartName) {
                             sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
@@ -419,8 +407,8 @@
                         if (HBillNo) {
                             sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                         }
-                        if (PartNumber) {
-                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        if (PartModel) {
+                            sWhere += " and 瑙勬牸鍨嬪彿 like '%" + PartModel + "%'";
                         }
                         if (PartName) {
                             sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
@@ -434,8 +422,8 @@
                         if (HBillNo) {
                             sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                         }
-                        if (PartNumber) {
-                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        if (PartModel) {
+                            sWhere += " and 瑙勬牸鍨嬪彿 like '%" + PartModel + "%'";
                         }
                         if (PartName) {
                             sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
@@ -449,8 +437,8 @@
                         if (HBillNo) {
                             sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                         }
-                        if (PartNumber) {
-                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        if (PartModel) {
+                            sWhere += " and 瑙勬牸鍨嬪彿 like '%" + PartModel + "%'";
                         }
                         if (PartName) {
                             sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
@@ -464,8 +452,8 @@
                         if (HBillNo) {
                             sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                         }
-                        if (PartNumber) {
-                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        if (PartModel) {
+                            sWhere += " and 瑙勬牸鍨嬪彿 like '%" + PartModel + "%'";
                         }
                         if (PartName) {
                             sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
@@ -552,7 +540,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
@@ -621,7 +611,7 @@
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
                 $("#HBillNo").val("");//鍗曟嵁鍙�
-                $("#PartNumber").val("");//鐗╂枡缂栫爜
+                $("#PartModel").val("");//鐗╂枡缂栫爜
                 $("#PartName").val("");//鐗╂枡鍚嶇О
                 $("#HDeptName").val("");//鍗曟嵁鍙�
                 $("#ColContent").val("");
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 97009a0..6240511 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -36,20 +36,34 @@
                                         <div class="layui-col-xs12 layui-inline">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
+                                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HModel" id="HModel">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠撳簱</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HWareHouse" id="HWareHouse">
+                                                    </div>
+                                                </div>                                                
+                                                <div class="layui-inline">
                                                     <label class="layui-form-label">鐗╂枡浠g爜</label>
                                                     <div class="layui-input-block">
                                                         <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                     </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>
+                                            </div>
+                                            <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">鐗╂枡鍚嶇О</label>
                                                     <div class="layui-input-block">
                                                         <input type="text" class="layui-input" name="HName" id="HName">
                                                     </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>
+                                                </div> 
                                             </div>
                                             <div>
                                                 <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -100,18 +114,18 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'radio', fixed: 'left' }
+                    , { field: '浠撳簱', title: '浠撳簱',width:240 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', sort: true, width: 170 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180 }
+                    , { field: '鎵规', title: '鎵规', width: 115 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 85}
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' }
+                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
                     , { field: '鐗╂枡浠撳簱璧勬枡浠g爜', title: '鐗╂枡浠撳簱璧勬枡浠g爜', sort: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', sort: true }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
                     , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' }
                     , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: '鎵规', title: '鎵规' }
-                    , { field: '鏁伴噺', title: '鏁伴噺' }
-                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' }
-                    , { field: '浠撳簱', title: '浠撳簱' }
                     , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜' }
                     , { field: '浠撲綅', title: '浠撲綅' }
                     , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
@@ -148,11 +162,19 @@
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
+                var HModel = $("#HModel").val().replace('筛', '');
+                var HWareHouse = $("#HWareHouse").val();
                 if (HNumber) {
-                    sWhere += " and 鐗╂枡浠g爜 = '" + HNumber + "'";
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HNumber + "%'";
                 }
                 if (HName) {
-                    sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+                }
+                if (HModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+                }
+                if (HWareHouse) {
+                    sWhere += " and 浠撳簱 like '%" + HWareHouse + "%'";
                 }
                 $.ajax({
                     url: GetWEBURL() + '/PublicPageMethod/MaterialList',
@@ -162,7 +184,7 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
diff --git a/WebTM/views/PublicPage/SourceInformation.html b/WebTM/views/PublicPage/SourceInformation.html
index ef2adfc..9a366ae 100644
--- a/WebTM/views/PublicPage/SourceInformation.html
+++ b/WebTM/views/PublicPage/SourceInformation.html
@@ -191,9 +191,9 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            //layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index ca63a51..dccecd8 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -27,25 +27,25 @@
                                             <li class="layui-col-xs3">
                                                 <a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
                                                     <i class="layui-icon layui-icon-add-circle"></i>
-                                                    <cite>鐢熶骇璁㈠崟缁存姢</cite>
+                                                    <cite>娲惧伐鍗�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
                                                 <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">
                                                     <i class="layui-icon layui-icon-mike"></i>
-                                                    <cite>宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</cite>
+                                                    <cite>娲惧伐鍗曞垪琛�</cite>
                                                 </a>
-                                            </li>
+                                            </li>                                            
                                             <li class="layui-col-xs3">
-                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">
-                                                    <i class="layui-icon layui-icon-android"></i>
-                                                    <cite>娲惧伐鍗曠淮鎶�</cite>
+                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
+                                                    <i class="layui-icon layui-icon-theme"></i>
+                                                    <cite>宸ュ簭姹囨姤</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
                                                 <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
                                                     <i class="layui-icon layui-icon-chart"></i>
-                                                    <cite>宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</cite>
+                                                    <cite>宸ュ簭姹囨姤鍗曞垪琛�</cite>
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
@@ -55,23 +55,11 @@
                                                 </a>
                                             </li>
                                             <li class="layui-col-xs3">
-                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
-                                                    <i class="layui-icon layui-icon-theme"></i>
-                                                    <cite>鎶ュ伐鏂板</cite>
-                                                </a>
-                                            </li>
-                                            <li class="layui-col-xs3">
                                                 <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
                                                     <i class="layui-icon layui-icon-addition"></i>
-                                                    <cite>鏉$爜涓绘。缁存姢</cite>
+                                                    <cite>鏉$爜鍒楄〃</cite>
                                                 </a>
-                                            </li>
-                                            <li class="layui-col-xs3">
-                                                <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
-                                                    <i class="layui-icon layui-icon-release"></i>
-                                                    <cite>鐗╂枡鍒楄〃</cite>
-                                                </a>
-                                            </li>
+                                            </li>                                            
                                         </ul>
                                         <ul class="layui-row layui-col-space10">
                                             <li class="layui-col-xs3">
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 2097e44..c07220f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -25,11 +25,11 @@
             <div class="layui-header">
                 <!-- 澶撮儴鍖哄煙 -->
                 <ul class="layui-nav layui-layout-left">
-                    <!--<li class="layui-nav-item layadmin-flexible" lay-unselect>
+                    <li class="layui-nav-item layadmin-flexible" lay-unselect style="display:none;">
                         <a href="javascript:;" layadmin-event="flexible" title="渚ц竟浼哥缉">
                             <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                         </a>
-                    </li>-->
+                    </li>
                     <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="http://www.layui.com/admin/" target="_blank" title="鍓嶅彴">
                             <i class="layui-icon layui-icon-website"></i>
@@ -103,91 +103,91 @@
                         <img src="../layuiadmin/myicon/win.svg" alt="PC绔�" style="width:25px;height:25px;margin-right: 5px;" />
                         <span>LMES绠$悊绯荤粺</span>
                     </div>
-                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
+                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="">
                         <!-- 閲囪喘绠$悊 -->
-                        <li data-name="set" class="layui-nav-item">
+                        <!--<li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-cellphone"></i><cite>閲囪喘绠$悊</cite></a>
                             <dl class="layui-nav-child">
                                 <dd>
                                     <a>閲囪喘璁㈠崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">閲囪喘璁㈠崟缁存姢</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">閲囪喘璁㈠崟鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
-                                <dd>
+                                </dd>-->
+                                <!--<dd>
                                     <a>濮斿璁㈠崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">濮斿璁㈠崟缁存姢</a></dd>
-                                        <dd><a lay-href="浠撳瓨绠$悊/濮斿鐢ㄦ枡鍗�/WW_PPBomBillList.html">濮斿鐢ㄦ枡鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">濮斿璁㈠崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/濮斿鐢ㄦ枡鍗�/WW_PPBomBillList.html">濮斿鐢ㄦ枡鍗曞垪琛�</a></dd>
                                     </dl>
-                                </dd>
-                                <dd>
+                                </dd>-->
+                                <!--<dd>
                                     <a>鏀舵枡閫氱煡鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">鏀舵枡閫氱煡鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">鏀舵枡閫氱煡鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">鏀舵枡閫氱煡鍗�</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <!--<dd>
                                     <a>閫�鏂欓�氱煡鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">閫�鏂欓�氱煡鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">閫�鏂欓�氱煡鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html">閫�鏂欓�氱煡鍗�</a></dd>
                                     </dl>
                                 </dd>-->
-                                <dd>
+                                <!--<dd>
                                     <a>閲囪喘鍏ュ簱鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗�</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <!--<dd>
                                     <a>閲囪喘閫�鏂欏崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>
+                                        <dd><a lay-href="閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">閲囪喘閫�鏂欏崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>-->
-                            </dl>
-                        </li>
+                            <!--</dl>
+                        </li>-->
                         <!-- 閿�鍞鐞� -->
-                        <li data-name="set" class="layui-nav-item">
+                        <!--<li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-circle"></i><cite>閿�鍞鐞�</cite></a>
                             <dl class="layui-nav-child">
                                 <dd>
                                     <a>閿�鍞鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">閿�鍞鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">閿�鍞鍗�</a></dd>
-                                    </dl>
+                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">閿�鍞鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">閿�鍞鍗�</a></dd>-->
+                                    <!--</dl>
                                 </dd>
                                 <dd>
                                     <a>鍙戣揣閫氱煡鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗�</a></dd>
-                                    </dl>
-                                </dd>
+                                        <dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗�</a></dd>-->
+                                    <!--</dl>
+                                </dd>-->
                                 <!--<dd>
                                     <a>閫�璐ч�氱煡鍗�</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">閫�璐ч�氱煡鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">閫�璐ч�氱煡鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>-->
-                                <dd>
+                                <!--<dd>
                                     <a>閿�鍞嚭搴撳崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <!--<dd>
                                     <a>閿�鍞��璐у崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>
+                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>-->
-                            </dl>
-                        </li>
+                            <!--</dl>
+                        </li>-->
                         <!-- 浠撳瓨绠$悊 -->
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-down"></i><cite>浠撳瓨绠$悊</cite></a>
@@ -195,52 +195,52 @@
                                 <dd>
                                     <a>楠屾敹鍏ュ簱</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟缁存姢</a></dd>
-                                        <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曠淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟缁存姢</a></dd>-->
-                                        <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曠淮鎶�</a></dd>-->
-                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曠淮鎶�</a></dd>-->
-                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>-->
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>-->
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>棰嗘枡鍙戣揣</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曠淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟缁存姢</a></dd>-->
-                                        <!--<dd><a lay-href="">鐢熶骇琛ユ枡鍗曠淮鎶</a></dd>-->
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟缁存姢</a></dd>
-                                        <!--<dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟缁存姢</a></dd>-->
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>-->
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="">鐢熶骇琛ユ枡鍗曞垪琛╪</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>-->
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>璋冩嫧鐩樼偣</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillEdit.html">璋冩嫧鐢宠鍗�</a></dd>
-                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">璋冩嫧鐢宠鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">鐩存帴璋冩嫧鍗曠淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>-->
-                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>-->
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillEdit.html">璋冩嫧鐢宠鍗�</a></dd>-->
+                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">璋冩嫧鐢宠鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">鐩存帴璋冩嫧鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>-->
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鏉$爜涓绘。</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill.html">鏉$爜鐢熸垚</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉$爜涓绘。缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉$爜鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_SplitBarCode.html">鏉$爜鎷嗙爜</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉$爜鐘舵�佸彉鏇村崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">鏉$爜鐘舵�佸彉鏇村崟缁存姢</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBill_OutList.html">鏉$爜褰掓。缁存姢</a></dd>
+                                        <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉$爜鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">鏉$爜鐘舵�佸彉鏇村崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBill_OutList.html">鏉$爜褰掓。鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>缂撳瓨鍒楄〃</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�</a></dd>
@@ -248,7 +248,7 @@
                                         <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">璋冩嫧鍗曠紦瀛樺垪琛�</a></dd>
                                         <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <dd>
                                     <a>浠撳簱鎶ヨ〃</a>
                                     <dl class="layui-nav-child">
@@ -268,44 +268,44 @@
                                 <dd>
                                     <a>宸ュ簭</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>鐢熶骇宸ヤ綅</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇宸ヤ綅缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇宸ヤ綅鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <dd>
                                     <a>宸ヤ綔涓績</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>鐢熶骇鐝粍</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
-                                <dd>
+                                </dd>-->
+                                <!--<dd>
                                     <a>鐢熶骇鐗╂枡娓呭崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">鐗╂枡娓呭崟缁存姢</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">鐗╂枡娓呭崟鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <dd>
                                     <a>宸ヨ壓璺嚎</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
-                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">宸ヨ壓璺嚎鏌ヨ</a></dd>
+                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">宸ヨ壓璺嚎鏌ヨ</a></dd>-->
                                         <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
                                         <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd>
-                                        <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillMainRates.html">宸ヨ壓璺嚎锛堢淮鎶ゅ伐浠凤級</a></dd>-->
+                                        <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillMainRates.html">宸ヨ壓璺嚎锛堝垪琛ㄥ伐浠凤級</a></dd>-->
                                     </dl>
                                 <dd>
-                                <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+                                <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>-->
                             </dl>
                         </li>
                         <!-- 鐢熶骇绠$悊 -->
@@ -315,7 +315,7 @@
                                 <dd>
                                     <a>鐢熶骇璁㈠崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇璁㈠崟缁存姢</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇璁㈠崟鍒楄〃</a></dd>
                                         <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">鐢熶骇璁㈠崟瀵煎叆</a></dd>-->
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">鐢熶骇璁㈠崟</a></dd>
                                     </dl>
@@ -323,61 +323,61 @@
                                 <dd>
                                     <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>-->
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>姹囨姤绠$悊(宸ュ簭)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曞垪琛�</a></dd>-->
                                         <!--<dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>-->
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>寮�缁撶彮绠$悊(宸ュ簭)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟缁存姢</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鎶ュ伐绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
-                                        <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
+                                        <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>-->
                                         <!--<dd><a lay-href="">鎶ユ鐢宠n</a></dd>-->
-                                    </dl>
+                                    <!--</dl>
                                 </dd>
                                 <dd>
                                     <a>涓婃枡闃查敊</a>
-                                    <dl class="layui-nav-child">
+                                    <dl class="layui-nav-child">-->
                                         <!--<dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>-->
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曠淮鎶�</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>缁勮杩芥函鍗�</a>
-                                    <dl class="layui-nav-child">
+                                    <dl class="layui-nav-child">-->
                                         <!--<dd><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮杩芥函鍗�</a></dd>-->
-                                        <!--<dd><a lay-href="鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曠淮鎶�</a></dd>-->
-                                    </dl>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曞垪琛�</a></dd>-->
+                                    <!--</dl>
                                 </dd>
                                 <dd>
                                     <a>缁勬墭鍗�</a>
-                                    <dl class="layui-nav-child">
-                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>-->
-                                    </dl>
+                                    <dl class="layui-nav-child">-->
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曞垪琛�</a></dd>-->
+                                    <!--</dl>
                                 </dd>
                                 <dd>
                                     <a>鏃ヨ鍒掑钩鍙�</a>
@@ -385,18 +385,18 @@
                                         <dd>
                                             <a>鐢熶骇璁″垝骞冲彴</a>
                                             <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>-->
                                                 <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
-                                                <dd><a lay-href="鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+                                                <!--<dd><a lay-href="鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
                                                 <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
                                             </dl>
                                         </dd>
                                         <dd>
                                             <a>鏃ヨ鍒掑伐鍗�</a>
                                             <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>-->
                                                 <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
-                                            </dl>
+                                            <!--</dl>
                                         </dd>
                                         <dd>
                                             <a>瑕佹枡璁″垝</a>
@@ -436,9 +436,9 @@
                                             </dl>
                                         </dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                             </dl>
-                        </li>-->
+                        </li>
                         <!-- 杞﹂棿绠$悊 -->
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠$悊</cite></a>
@@ -447,9 +447,9 @@
                                     <a>宸ュ簭娴佽浆</a>
                                     <dl class="layui-nav-child">
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>-->
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗$淮鎶�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娲惧伐鍗曟槑缁嗗垪琛�</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>-->
@@ -458,39 +458,39 @@
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
                                         <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>-->
-                                        <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>-->
+                                        <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟鍒楄〃n</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd>-->
-                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曠淮鎶�</a></dd>-->
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲忥紙鐟炰笌绁猴級</a></dd>-->
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">宸ュ簭濮斿鍙戝嚭鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul.html">宸ュ簭濮斿鍙戝嚭鍗曟壒閲�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">宸ュ簭濮斿鍙戝嚭鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">宸ュ簭濮斿鍙戝嚭鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">宸ュ簭濮斿鎺ユ敹鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul.html">宸ュ簭濮斿鎺ユ敹鍗曟壒閲�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">宸ュ簭濮斿鎺ユ敹鍗曠淮鎶�</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">宸ュ簭濮斿鎺ユ敹鍗曞垪琛�</a></dd>-->
                                     </dl>
                                 </dd>
                                 <!--<dd>
                                     <a>绂绘暎鍒堕��</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanEdit.html">宸ュ簭璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">宸ュ簭璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">宸ュ簭璁″垝鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">宸ュ簭娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_AddEntrustProcSendWork.html">濮斿宸ュ簭娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">濮斿宸ュ簭璁″垝姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>-->
                                 <!--<dd>
@@ -500,24 +500,24 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">宸茶绠卞崟鎹垪琛�</a></dd>
                                     </dl>
                                 </dd>-->
-                                <!--<dd>
+                                <dd>
                                     <a>鎶ヨ〃鍒嗘瀽</a>
-                                    <dl class="layui-nav-child append" id="append">-->
-                                        <!--<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>-->
-                                        <!--<dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>-->
+                                    <dl class="layui-nav-child append" id="append">
+                                        <!--<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
+                                        <dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>-->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopProcessWIPReport.html">鐢熶骇杞﹂棿宸ュ簭鎶ヨ〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopProcessWIPSumReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePieceWorkReport.html">宸ュ簭姹囨姤鏃ユ姤琛�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePayReport.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePaySumReport.html">璁′欢宸ヨ祫姹囨�绘姤琛�</a></dd>
                                     </dl>
-                                </dd>-->
+                                </dd>
                                 <!--<dd>
                                     <a>鍙枡绠$悊</a>
                                     <dl class="layui-nav-child append" id="append">
@@ -535,64 +535,64 @@
                             </dl>
                         </li>
                         <!-- 璐ㄩ噺绠$悊 -->
-                        <li data-name="set" class="layui-nav-item">
+                        <!--<li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-search"></i><cite>璐ㄩ噺绠$悊</cite></a>
-                            <dl class="layui-nav-child">
+                            <dl class="layui-nav-child">-->
                                 <!--<dd>
                                     <a>鍩虹寤烘ā</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">妫�楠屾柟妗�</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堢淮鎶�</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堝垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>杩囩▼妫�楠�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">棣栦欢妫�楠屽崟</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">棣栦欢妫�楠屽崟缁存姢</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">棣栦欢妫�楠屽崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">宸℃璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">宸℃璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">宸℃璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">宸ュ簭杞Щ妫�楠屽崟</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">宸ュ簭杞Щ妫�楠屽崟缁存姢</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">宸ュ簭杞Щ妫�楠屽崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鐗╂祦妫�楠�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟缁存姢</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">鐢熶骇鍏ュ簱妫�楠屽崟</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">鐢熶骇鍏ュ簱妫�楠屽崟缁存姢</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">鐢熶骇鍏ュ簱妫�楠屽崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">鍑哄巶妫�楠屽崟</a></dd>
-                                        <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">鍑哄巶妫�楠屽崟缁存姢</a></dd>
+                                        <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">鍑哄巶妫�楠屽崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>-->
                                 <!--<dd>
                                     <a>MRB璇勫</a>
                                     <dl class="layui-nav-child">-->
                                         <!--<dd><a lay-href="">MRB璇勫鍗昻</a></dd>-->
-                                        <!--<dd><a lay-href="">MRB璇勫鍗曠淮鎶</a></dd>-->
+                                        <!--<dd><a lay-href="">MRB璇勫鍗曞垪琛╪</a></dd>-->
                                     <!--</dl>
                                 </dd>-->
-                                <dd>
+                                <!--<dd>
                                     <a>涓嶈壇鍝�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">涓嶈壇鍝佸鐞嗗崟</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">涓嶈壇鍝佸鐞嗗崟缁存姢</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">涓嶈壇鍝佸鐞嗗崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>寮傚父鍙嶉</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                             </dl>
-                        </li>
-                        鍣ㄥ叿绠$悊
+                        </li>-->
+                        <!--鍣ㄥ叿绠$悊
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-table"></i><cite>鍣ㄥ叿绠$悊</cite></a>
                             <dl class="layui-nav-child">
@@ -600,85 +600,85 @@
                                     <a>鍩虹寤烘ā</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">鍣ㄥ叿鍒嗙被</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">鍣ㄥ叿鍒嗙被缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">鍣ㄥ叿鍒嗙被鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">鍣ㄥ叿涓绘。</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">鍣ㄥ叿淇濆吇瑙勭▼鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillEdit.html">鍣ㄥ叿鐐规瑙勭▼鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">鍣ㄥ叿鐐规瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">鍣ㄥ叿鐐规瑙勭▼鍗曞垪琛�</a></dd>-->
                                         <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>-->
-                                    </dl>
+                                    <!--</dl>
                                 </dd>
                                 <dd>
                                     <a>浠撳偍绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">鍣ㄥ叿澶勭悊鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">鍣ㄥ叿澶勭悊鍑哄簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">鍣ㄥ叿澶勭悊鍑哄簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">鍣ㄥ叿鏀瑰埗鐢宠鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">鍣ㄥ叿鏀瑰埗鐢宠鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">鍣ㄥ叿鏀瑰埗鐢宠鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">鍣ㄥ叿鐩存帴璋冩嫧鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">鍣ㄥ叿鐩存帴璋冩嫧鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutButNotStepInList.html">鍣ㄥ叿鍒嗘寮忚皟鍑烘湭璋冨叆鎶ヨ〃</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBill.html">鍣ㄥ叿鎶ュ簾鐢宠鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBillList.html">鍣ㄥ叿鎶ュ簾鐢宠鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBillList.html">鍣ㄥ叿鎶ュ簾鐢宠鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBill.html">鍣ㄥ叿鐘舵�佸彉鏇村崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBillList.html">鍣ㄥ叿鐘舵�佸彉鏇村崟缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBillList.html">鍣ㄥ叿鐘舵�佸彉鏇村崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>瀵垮懡绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>缁翠慨绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">鏁呴殰鐧昏</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">鏁呴殰鐧昏鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">鏁呴殰鐧昏鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillEdit.html">鍣ㄥ叿缁翠慨娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillList.html">鍣ㄥ叿缁翠慨娲惧伐鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillList.html">鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -695,62 +695,62 @@
                                     </dl>
                                 </dd>
                             </dl>
-                        </li>
-                        璁惧绠$悊
+                        </li>-->
+                        <!--璁惧绠$悊
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-camera"></i><cite>璁惧绠$悊</cite></a>
                             <dl class="layui-nav-child">
                                 <dd>
                                     <a>鍩虹寤烘ā</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">璁惧鍒嗙被缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">璁惧鍒嗙被鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileMainEdit.html">璁惧妗f</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html">璁惧妗f缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html">璁惧妗f鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">璁惧鐐规瑙勭▼鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曞垪琛�</a></dd>-->
                                         <!--<dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>-->
-                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBill.html">璁惧澶囧搧澶囦欢</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBillList.html">璁惧澶囧搧澶囦欢缁存姢</a></dd>
+                                        <!--<dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBill.html">璁惧澶囧搧澶囦欢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBillList.html">璁惧澶囧搧澶囦欢鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBill.html">璁惧澶囧搧澶囦欢鍙樻洿鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">璁惧澶囧搧澶囦欢鍙樻洿鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">璁惧澶囧搧澶囦欢鍙樻洿鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBill.html">璁惧鐘舵�佸彉鏇村崟</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">璁惧鐘舵�佸彉鏇村崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">璁惧鐘舵�佸彉鏇村崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBill.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBill.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillEdit.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟缁存姢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>缁翠慨绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">璁惧鏁呴殰鐧昏鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpConkBookBillList.html">璁惧鏁呴殰鐧昏鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpConkBookBillList.html">璁惧鏁呴殰鐧昏鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillEdit.html">璁惧缁翠慨娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html">璁惧缁翠慨娲惧伐鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html">璁惧缁翠慨娲惧伐鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗曞垪琛�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -760,8 +760,8 @@
                                     </dl>
                                 </dd>
                             </dl>
-                        </li>
-                        宸ヨ祫绠$悊
+                        </li>-->
+                        <!--宸ヨ祫绠$悊
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-dollar"></i><cite>宸ヨ祫绠$悊</cite></a>
                             <dl class="layui-nav-child">
@@ -769,21 +769,21 @@
                                     <a>宸ヨ祫缁撶畻鍗�(涓汉)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html">宸ヨ祫缁撶畻鍗�(涓汉)</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillList.html">宸ヨ祫缁撶畻鍗�(涓汉)缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillList.html">宸ヨ祫缁撶畻鍗�(涓汉)鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>宸ヨ祫缁撶畻鍗�(闆嗕綋)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillList.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillList.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>宸ヨ祫缁撶畻鍗�(鍏朵粬)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillList.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillList.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -796,7 +796,7 @@
                                     <a>鐝粍鑱屽憳娓呭崟</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/鐝粍鑱屽憳娓呭崟/Gy_GroupEmpBillEdit.html">鐝粍鑱屽憳娓呭崟</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/鐝粍鑱屽憳娓呭崟/Gy_GroupEmpBillList.html">鐝粍鑱屽憳娓呭崟缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鐝粍鑱屽憳娓呭崟/Gy_GroupEmpBillList.html">鐝粍鑱屽憳娓呭崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -811,41 +811,41 @@
                                     <a>鑰冨嫟姹囨姤鍗�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">鑰冨嫟姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">鑰冨嫟姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">鑰冨嫟姹囨姤鍗曞垪琛�</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <!--<dd>
                                     <a>鑰冨嫟姹囨姤鍗昣闆呯惇璇�</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html">鑰冨嫟姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">鑰冨嫟姹囨姤鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">鑰冨嫟姹囨姤鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>-->
-                                <dd>
+                                <!--<dd>
                                     <a>澶栬喘澧欏竷</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillList.html">澶栬喘澧欏竷宸ヨ祫鍒楄〃</a></dd>
                                         <dd><a lay-href="宸ヨ祫绠$悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillEdit.html">澶栬喘澧欏竷宸ヨ祫</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                                 <!--<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/ReportList.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>-->
                                 <!--<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/ReportList2.html">鏈堝害宸ヨ祫鎶ヨ〃</a></dd>-->
-                                <dd>
+                                <!--<dd>
                                     <a>鎵hˉ璧勬枡</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_DuSubsidyItemBillList.html">鎵hˉ宸ヨ祫璧勬枡缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_DuSubsidyItemBillList.html">鎵hˉ宸ヨ祫璧勬枡鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>宸ヨ祫绫诲瀷</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html">宸ヨ祫绫诲瀷鍒楄〃缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html">宸ヨ祫绫诲瀷鍒楄〃鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>宸ョ鍒嗙被</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkTypeBillList.html">宸ョ鍒楄〃缁存姢</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkTypeBillList.html">宸ョ鍒楄〃鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -865,7 +865,7 @@
                                     </dl>
                                 </dd>
                             </dl>
-                        </li>
+                        </li>-->
                         <!--鍙鍖栫湅鏉�-->
                         <li data-name="template" class="layui-nav-item">
                             <a href="javascript:;" lay-tips="鍙鍖栫湅鏉�" lay-direction="2">
@@ -976,19 +976,19 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxMIX.html">绋庣粍鍚堝垪琛�</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>璁惧鍩虹璧勬枡</a>
-                                    <dl class="layui-nav-child">
+                                    <dl class="layui-nav-child">-->
                                         <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">鐐规椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰缁存姢</a></dd>
+                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰鍒楄〃</a></dd>-->
                                         <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">缁翠慨椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰缁存姢</a></dd>
+                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰鍒楄〃</a></dd>-->
                                         <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">缁翠慨妫�楠岄」鐩�</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩淮鎶�</a></dd>
+                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩垪琛�</a></dd>-->
                                         <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">淇濆吇椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰缁存姢</a></dd>
+                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMould.html">浜у搧涓庡櫒鍏锋竻鍗�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">浜у搧涓庡櫒鍏锋竻鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">浜у搧涓庡櫒鍏锋竻鍗曞垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -1000,7 +1000,7 @@
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔︾淮鎶�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔﹀垪琛�</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd>
                                         <dd><a href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html" target="main_self_frame">浣滀笟鎸囧涔�</a></dd>
                                     </dl>
@@ -1016,7 +1016,7 @@
                                     <a>宸ヨ祫鍩虹璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">宸ヤ綔鏃ュ垪琛�</a></dd>
                                     </dl>
                                 </dd>
@@ -1024,20 +1024,20 @@
                                     <a>浜у搧璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQty.html">渚涘簲鍟嗙墿鏂欒祫鏂�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欑淮鎶�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欏垪琛�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
                                     <a>鏁版嵁瀛楀吀</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html"> 鏁版嵁瀛楀吀(瑙嗗浘)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html"> 鏁版嵁瀛楀吀(瑙嗗浘)缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html"> 鏁版嵁瀛楀吀(瑙嗗浘)鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)缁存姢</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                             </dl>
                         </li>
                         <!-- 绯荤粺绠$悊 -->
@@ -1053,7 +1053,7 @@
                                         <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">绯荤粺鍗曟嵁绫诲瀷鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
-                                        <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅缁存姢</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅鍒楄〃</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillSubTypeList.html">绯荤粺鍗曟嵁瀛愮被鍨嬫煡璇�</a></dd>
                                     </dl>
                                 </dd>
@@ -1073,6 +1073,7 @@
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserWorkCenter.html">鐢ㄦ埛鍏宠仈宸ヤ綔涓績</a></dd>
                                         <!--<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>-->
                                         <dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
                                     </dl>
@@ -1154,20 +1155,24 @@
             }
 
             $("#LAY_app_flexible").click();
+
+            $(document).on('click', "#fouce", function () {
+                layer.msg("娌℃湁灞曞紑鏉冮檺");
+            });
         });
 
 
         var timer;
         var dom;
         //绉诲叆鏃惰Е鍙戜簨浠�(涓嶅寘鍚瓙鍏冪礌)
-        fouce.onmouseenter = function (event) {
-            dom = $("#LAY_app_flexible").attr('class');
-            //鍏抽棴瀹氭椂鍣�
-            clearInterval(timer);
-            if (dom == "layui-icon layui-icon-spread-left") {
-                $("#LAY_app_flexible").click();
-            }
-        }
+        //fouce.onmouseenter = function (event) {
+        //    dom = $("#LAY_app_flexible").attr('class');
+        //    //鍏抽棴瀹氭椂鍣�
+        //    clearInterval(timer);
+        //    if (dom == "layui-icon layui-icon-spread-left") {
+        //        $("#LAY_app_flexible").click();
+        //    }
+        //}
          //绉诲嚭鏃惰Е鍙戜簨浠�(涓嶅寘鍚瓙鍏冪礌)
         fouce.onmouseleave = function (event) {
             dom = $("#LAY_app_flexible").attr('class');
diff --git a/WebTM/views/index_Office.html b/WebTM/views/index_Office.html
new file mode 100644
index 0000000..166af12
--- /dev/null
+++ b/WebTM/views/index_Office.html
@@ -0,0 +1,1214 @@
+锘�
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>LMES绠$悊绯荤粺</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/Scripts/jquery-3.5.1.min.js"></script>
+
+    <script>
+        /^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
+    </script>
+
+</head>
+<body class="layui-layout-body">
+
+    <div id="LAY_app">
+        <div class="layui-layout layui-layout-admin">
+            <div class="layui-header">
+                <!-- 澶撮儴鍖哄煙 -->
+                <ul class="layui-nav layui-layout-left">
+                    <li class="layui-nav-item layadmin-flexible" lay-unselect style="display:none;">
+                        <a href="javascript:;" layadmin-event="flexible" title="渚ц竟浼哥缉">
+                            <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+                        </a>
+                    </li>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <a href="http://www.layui.com/admin/" target="_blank" title="鍓嶅彴">
+                            <i class="layui-icon layui-icon-website"></i>
+                        </a>
+                    </li>-->
+                    <li class="layui-nav-item" lay-unselect>
+                        <a href="javascript:;" layadmin-event="refresh" title="鍒锋柊">
+                            <i class="layui-icon layui-icon-refresh-3"></i>
+                        </a>
+                    </li>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
+                    </li>-->
+                    <li class="layui-nav-item" lay-unselect style="color: black;margin-left:290px">
+                        <span>鐧诲綍缁勭粐锛�</span>
+                        <label id="Organization"></label>
+                    </li>
+                </ul>
+                <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
+
+                    <li class="layui-nav-item" lay-unselect>
+                        <a href="javascript:void(0);">
+                            <!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="娑堟伅涓績">-->
+                            <i class="layui-icon layui-icon-notice"></i>
+
+                            <!--濡傛灉鏈夋柊娑堟伅锛屽垯鏄剧ず灏忓渾鐐�-->
+                            <span class="layui-badge-dot"></span>
+                        </a>
+                    </li>
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <a href="javascript:;" layadmin-event="theme">
+                            <i class="layui-icon layui-icon-theme"></i>
+                        </a>
+                    </li>-->
+                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <a href="javascript:;" layadmin-event="note">
+                            <i class="layui-icon layui-icon-note"></i>
+                        </a>
+                    </li>
+                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <a href="javascript:;" layadmin-event="fullscreen">
+                            <i class="layui-icon layui-icon-screen-full"></i>
+                        </a>
+                    </li>
+                    <li class="layui-nav-item" lay-unselect style="margin-right:12px;">
+                        <a href="javascript:;">
+                            <cite>
+                                <label name="UserName" id="UserName"></label>
+                            </cite>
+                        </a>
+                        <dl class="layui-nav-child">
+                            <!--<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>-->
+                            <dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
+                            <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
+                        </dl>
+                    </li>
+
+                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
+                        <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
+                    </li>-->
+                    <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
+                        <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
+                    </li>
+                </ul>
+            </div>
+
+            <!-- 渚ц竟鑿滃崟 -->
+            <div class="layui-side layui-side-menu" id="fouce">
+                <div class="layui-side-scroll">
+                    <div class="layui-logo" lay-href="home/console.html">
+                        <img src="../layuiadmin/myicon/win.svg" alt="PC绔�" style="width:25px;height:25px;margin-right: 5px;" />
+                        <span>LMES绠$悊绯荤粺</span>
+                    </div>
+                    <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
+                        <!-- 閲囪喘绠$悊 -->
+                        <!--<li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-cellphone"></i><cite>閲囪喘绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>閲囪喘璁㈠崟</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">閲囪喘璁㈠崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                        <!--<dd>
+                            <a>濮斿璁㈠崟</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">濮斿璁㈠崟鍒楄〃</a></dd>
+                                <dd><a lay-href="浠撳瓨绠$悊/濮斿鐢ㄦ枡鍗�/WW_PPBomBillList.html">濮斿鐢ㄦ枡鍗曞垪琛�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>鏀舵枡閫氱煡鍗�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">鏀舵枡閫氱煡鍗曞垪琛�</a></dd>
+                                <dd><a lay-href="閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">鏀舵枡閫氱煡鍗�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閫�鏂欓�氱煡鍗�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">閫�鏂欓�氱煡鍗曞垪琛�</a></dd>
+                                <dd><a lay-href="閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html">閫�鏂欓�氱煡鍗�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閲囪喘鍏ュ簱鍗�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
+                                <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閲囪喘閫�鏂欏崟</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閲囪喘绠$悊/閲囪喘閫�鏂欏崟/Cg_PurchaseReturnList.html">閲囪喘閫�鏂欏崟鍒楄〃</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--</dl>
+                        </li>-->
+                        <!-- 閿�鍞鐞� -->
+                        <!--<li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-circle"></i><cite>閿�鍞鐞�</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>閿�鍞鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">閿�鍞鍗曞垪琛�</a></dd>-->
+                        <!--<dd><a lay-href="閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">閿�鍞鍗�</a></dd>-->
+                        <!--</dl>
+                        </dd>
+                        <dd>
+                            <a>鍙戣揣閫氱煡鍗�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗曞垪琛�</a></dd>-->
+                        <!--<dd><a lay-href="閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">鍙戣揣閫氱煡鍗�</a></dd>-->
+                        <!--</dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閫�璐ч�氱煡鍗�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">閫�璐ч�氱煡鍗曞垪琛�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閿�鍞嚭搴撳崟</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟鍒楄〃</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>閿�鍞��璐у崟</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟鍒楄〃</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--</dl>
+                        </li>-->
+                        <!-- 浠撳瓨绠$悊 -->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-down"></i><cite>浠撳瓨绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>楠屾敹鍏ュ簱</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">閲囪喘閫�鏂欏崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">鐢熶骇鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">鐢熶骇閫�搴撳崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">鍏朵粬鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">濮斿鍔犲伐鍏ュ簱鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">濮斿鍔犲伐鍑哄簱鍗曞垪琛�</a></dd>-->
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>-->
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>棰嗘枡鍙戣揣</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">鐢熶骇棰嗘枡鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">鐢熶骇閫�鏂欏崟鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="">鐢熶骇琛ユ枡鍗曞垪琛╪</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">閿�鍞嚭搴撳崟鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">閿�鍞��璐у崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">鍏朵粬鍑哄簱鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>-->
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>璋冩嫧鐩樼偣</a>
+                                    <dl class="layui-nav-child">
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillEdit.html">璋冩嫧鐢宠鍗�</a></dd>-->
+                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">璋冩嫧鐢宠鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">鐩存帴璋冩嫧鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>-->
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏉$爜涓绘。</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鐢熸垚/Gy_BarCodeBill.html">鏉$爜鐢熸垚</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">鏉$爜涓绘。鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_SplitBarCode.html">鏉$爜鎷嗙爜</a></dd>
+                                        <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">鏉$爜鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">鏉$爜鐘舵�佸彉鏇村崟鍒楄〃</a></dd>-->
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBill_OutList.html">鏉$爜褰掓。鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>缂撳瓨鍒楄〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">鍏朵粬鍑哄簱鍗曠紦瀛樺垪琛�</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">璋冩嫧鍗曠紦瀛樺垪琛�</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <dd>
+                                    <a>浠撳簱鎶ヨ〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="浠撳瓨绠$悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鍑哄叆搴撹褰曡〃/Kf_ICStockBillSubList.html">鏉$爜鍑哄叆搴撹褰曡〃</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryList_WMS.html">鏉$爜搴撳瓨鏌ヨ</a></dd>
+                                        <!--<dd><a lay-href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉$爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>-->
+                                        <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>
+                        <!-- 璁″垝绠$悊 -->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-edit"></i><cite>璁″垝绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>宸ュ簭</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>鐢熶骇宸ヤ綅</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇宸ヤ綅鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <dd>
+                                    <a>宸ヤ綔涓績</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>鐢熶骇鐝粍</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <!--<dd>
+                                    <a>鐢熶骇鐗╂枡娓呭崟</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">鐗╂枡娓呭崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <dd>
+                                    <a>宸ヨ壓璺嚎</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">宸ヨ壓璺嚎鏌ヨ</a></dd>-->
+                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
+                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd>
+                                        <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillMainRates.html">宸ヨ壓璺嚎锛堝垪琛ㄥ伐浠凤級</a></dd>-->
+                                    </dl>
+                                <dd>
+                                    <!--<dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>-->
+                            </dl>
+                        </li>
+                        <!-- 鐢熶骇绠$悊 -->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-email"></i><cite>鐢熶骇绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>鐢熶骇璁㈠崟</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">鐢熶骇璁㈠崟鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">鐢熶骇璁㈠崟瀵煎叆</a></dd>-->
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">鐢熶骇璁㈠崟</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>-->
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>姹囨姤绠$悊(宸ュ簭)</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曞垪琛�</a></dd>-->
+                                <!--<dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">浜ч噺姹囨姤鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html">璐ㄩ噺姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>寮�缁撶彮绠$悊(宸ュ簭)</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_MESBeginStepWorkBillList.html">寮�鐝崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html">鍋滃伐鎸傝捣鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鎶ュ伐绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
+                                        <dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>-->
+                                <!--<dd><a lay-href="">鎶ユ鐢宠n</a></dd>-->
+                                <!--</dl>
+                                </dd>
+                                <dd>
+                                    <a>涓婃枡闃查敊</a>
+                                    <dl class="layui-nav-child">-->
+                                <!--<dd><a lay-href="">涓婃枡闃查敊鍗昻</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_MaterToSourceStepBillList.html">涓婃枡闃查敊鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>缁勮杩芥函鍗�</a>
+                                    <dl class="layui-nav-child">-->
+                                <!--<dd><a href="缁勮鍗�/Sc_AssemblyBill_Fast.html" target="main_self_frame">缁勮杩芥函鍗�</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曞垪琛�</a></dd>-->
+                                <!--</dl>
+                                </dd>
+                                <dd>
+                                    <a>缁勬墭鍗�</a>
+                                    <dl class="layui-nav-child">-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曞垪琛�</a></dd>-->
+                                <!--</dl>
+                                </dd>
+                                <dd>
+                                    <a>鏃ヨ鍒掑钩鍙�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd>
+                                            <a>鐢熶骇璁″垝骞冲彴</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏃ヨ鍒掑伐鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>-->
+                                <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+                                <!--</dl>
+                                        </dd>
+                                        <dd>
+                                            <a>瑕佹枡璁″垝</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鎻愭枡璁″垝</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鍩虹璧勬枡</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鍗虫椂搴撳瓨</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+                                            </dl>
+                                        </dd>
+                                        <dd>
+                                            <a>鎶ヨ〃</a>
+                                            <dl class="layui-nav-child">
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
+                                            </dl>
+                                        </dd>
+                                    </dl>
+                                </dd>-->
+                            </dl>
+                        </li>
+                        <!-- 杞﹂棿绠$悊 -->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>宸ュ簭娴佽浆</a>
+                                    <dl class="layui-nav-child">
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娲惧伐鍗曟槑缁嗗垪琛�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
+                                        <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>-->
+                                        <!--<dd><a lay-href="">宸ュ簭濮斿宸ュ崟鍒楄〃n</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲忥紙鐟炰笌绁猴級</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">宸ュ簭濮斿鍙戝嚭鍗�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul.html">宸ュ簭濮斿鍙戝嚭鍗曟壒閲�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">宸ュ簭濮斿鍙戝嚭鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">宸ュ簭濮斿鎺ユ敹鍗�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul.html">宸ュ簭濮斿鎺ユ敹鍗曟壒閲�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">宸ュ簭濮斿鎺ユ敹鍗曞垪琛�</a></dd>-->
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>绂绘暎鍒堕��</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanEdit.html">宸ュ簭璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">宸ュ簭璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">宸ュ簭娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_AddEntrustProcSendWork.html">濮斿宸ュ簭娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <!--<dd>
+                                    <a>澧欏挃瑁呯</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackingBill.html">澧欏挃瑁呯鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">宸茶绠卞崟鎹垪琛�</a></dd>
+                                    </dl>
+                                </dd>-->
+                                <dd>
+                                    <a>鎶ヨ〃鍒嗘瀽</a>
+                                    <dl class="layui-nav-child append" id="append">
+                                        <!--<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
+                                        <dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>-->
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>-->
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopProcessWIPReport.html">鐢熶骇杞﹂棿宸ュ簭鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopProcessWIPSumReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePieceWorkReport.html">宸ュ簭姹囨姤鏃ユ姤琛�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePayReport.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_EmployeePiecePaySumReport.html">璁′欢宸ヨ祫姹囨�绘姤琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>鍙枡绠$悊</a>
+                                    <dl class="layui-nav-child append" id="append">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴(鎸夎鍗曞彨鏂�)</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain_ZXBZ.html">鐢熶骇鍙枡骞冲彴(鏈�灏忓寘瑁呭彨鏂�)</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷f枡閰嶉�佸崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/杞﹂棿鏀舵枡/JIT_SendGoodsBillList.html">杞﹂棿鏀舵枡鍒楄〃</a></dd>-->
+                                <!--<dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃(-)</a></dd>-->
+                                <!--<dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                            </dl>
+                        </li>
+                        <!-- 璐ㄩ噺绠$悊 -->
+                        <!--<li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-search"></i><cite>璐ㄩ噺绠$悊</cite></a>
+                            <dl class="layui-nav-child">-->
+                        <!--<dd>
+                            <a>鍩虹寤烘ā</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
+                                <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">妫�楠屾柟妗�</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">妫�楠屾柟妗堝垪琛�</a></dd>
+                            </dl>
+                        </dd>
+                        <dd>
+                            <a>杩囩▼妫�楠�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">棣栦欢妫�楠屽崟</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">棣栦欢妫�楠屽崟鍒楄〃</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">宸℃璁板綍鍗�</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">宸℃璁板綍鍗曞垪琛�</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">宸ュ簭杞Щ妫�楠屽崟</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">宸ュ簭杞Щ妫�楠屽崟鍒楄〃</a></dd>
+                            </dl>
+                        </dd>
+                        <dd>
+                            <a>鐗╂祦妫�楠�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">鏉ユ枡鍏ュ簱妫�楠屽崟鍒楄〃</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">鐢熶骇鍏ュ簱妫�楠屽崟</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">鐢熶骇鍏ュ簱妫�楠屽崟鍒楄〃</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">鍑哄巶妫�楠屽崟</a></dd>
+                                <dd><a lay-href="璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">鍑哄巶妫�楠屽崟鍒楄〃</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>MRB璇勫</a>
+                            <dl class="layui-nav-child">-->
+                        <!--<dd><a lay-href="">MRB璇勫鍗昻</a></dd>-->
+                        <!--<dd><a lay-href="">MRB璇勫鍗曞垪琛╪</a></dd>-->
+                        <!--</dl>
+                        </dd>-->
+                        <!--<dd>
+                                    <a>涓嶈壇鍝�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">涓嶈壇鍝佸鐞嗗崟</a></dd>
+                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">涓嶈壇鍝佸鐞嗗崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>寮傚父鍙嶉</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">寮傚父鍙嶉鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>-->
+                        <!--鍣ㄥ叿绠$悊
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-table"></i><cite>鍣ㄥ叿绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>鍩虹寤烘ā</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">鍣ㄥ叿鍒嗙被</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">鍣ㄥ叿鍒嗙被鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">鍣ㄥ叿涓绘。</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">鍣ㄥ叿涓绘。鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html">鍣ㄥ叿淇濆吇瑙勭▼鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">鍣ㄥ叿淇濆吇瑙勭▼鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillEdit.html">鍣ㄥ叿鐐规瑙勭▼鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鐐规瑙勭▼鍗�/Sc_MouldDotCheckRuleBillList.html">鍣ㄥ叿鐐规瑙勭▼鍗曞垪琛�</a></dd>-->
+                        <!--<dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻</a></dd>-->
+                        <!--</dl>
+                                </dd>
+                                <dd>
+                                    <a>浠撳偍绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">鍣ㄥ叿澶勭悊鍑哄簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">鍣ㄥ叿澶勭悊鍑哄簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">鍣ㄥ叿鏀瑰埗鐢宠鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">鍣ㄥ叿鏀瑰埗鐢宠鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">鍣ㄥ叿鐩存帴璋冩嫧鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">鍣ㄥ叿鐩存帴璋冩嫧鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutButNotStepInList.html">鍣ㄥ叿鍒嗘寮忚皟鍑烘湭璋冨叆鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBill.html">鍣ㄥ叿鎶ュ簾鐢宠鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapRequestBillList.html">鍣ㄥ叿鎶ュ簾鐢宠鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBill.html">鍣ㄥ叿鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldStatusChangeBillList.html">鍣ㄥ叿鐘舵�佸彉鏇村崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>瀵垮懡绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">瀵垮懡璋冩暣鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeUseBillList.html">瀵垮懡鑰楃敤鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏃ュ父绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>缁翠慨绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">鏁呴殰鐧昏</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">鏁呴殰鐧昏鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillEdit.html">鍣ㄥ叿缁翠慨娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillList.html">鍣ㄥ叿缁翠慨娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">缁翠慨璁板綍鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">缁翠慨楠屾敹鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鍣ㄥ叿鎶ヨ〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/Sc_MouldAvailableList.html">鍣ㄥ叿鍙敤鏁版嵁琛�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">搴撳瓨鍙拌处</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">鍣ㄥ叿灞ュ巻琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>-->
+                        <!--璁惧绠$悊
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-camera"></i><cite>璁惧绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>鍩虹寤烘ā</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">璁惧鍒嗙被鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileMainEdit.html">璁惧妗f</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html">璁惧妗f鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html">璁惧鐐规瑙勭▼鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.html">璁惧鐐规瑙勭▼鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleEdit.html">璁惧淇濆吇瑙勭▼鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html">璁惧淇濆吇瑙勭▼鍗曞垪琛�</a></dd>-->
+                        <!--<dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html">璁惧灞ュ巻</a></dd>-->
+                        <!--<dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBill.html">璁惧澶囧搧澶囦欢</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsBillList.html">璁惧澶囧搧澶囦欢鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBill.html">璁惧澶囧搧澶囦欢鍙樻洿鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧澶囧搧澶囦欢/Sb_EquipSparepartsChangeBillList.html">璁惧澶囧搧澶囦欢鍙樻洿鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBill.html">璁惧鐘舵�佸彉鏇村崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鐘舵��/Sb_EquipStatusChangeBillList.html">璁惧鐘舵�佸彉鏇村崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBill.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBill.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏃ュ父绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillEdit.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鍏ュ簱妫�楠岄獙鏀跺崟/Sb_EquipStockInCheckBillList.html">璁惧鍏ュ簱妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillEdit.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧鎶曚骇妫�楠岄獙鏀跺崟/Sb_EquipWorkBeforeCheckBillList.html">璁惧鎶曚骇妫�楠岄獙鏀跺崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>缁翠慨绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">璁惧鏁呴殰鐧昏鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpConkBookBillList.html">璁惧鏁呴殰鐧昏鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillEdit.html">璁惧缁翠慨娲惧伐鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/璁惧缁翠慨娲惧伐鍗�/Sb_EquipRepairSendWorkBillList.html">璁惧缁翠慨娲惧伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>璁惧鎶ヨ〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="璁惧绠$悊/璁惧妗f/Gy_EquipFileBillResume.html">璁惧灞ュ巻琛�</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>-->
+                        <!--宸ヨ祫绠$悊
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-dollar"></i><cite>宸ヨ祫绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>宸ヨ祫缁撶畻鍗�(涓汉)</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html">宸ヨ祫缁撶畻鍗�(涓汉)</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillList.html">宸ヨ祫缁撶畻鍗�(涓汉)鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫缁撶畻鍗�(闆嗕綋)</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillList.html">宸ヨ祫缁撶畻鍗�(闆嗕綋)鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫缁撶畻鍗�(鍏朵粬)</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillList.html">宸ヨ祫缁撶畻鍗�(鍏朵粬)鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫杩愮畻</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫杩愮畻/Pay_SingleBalBillOperation.html">宸ヨ祫杩愮畻</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鐝粍鑱屽憳娓呭崟</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鐝粍鑱屽憳娓呭崟/Gy_GroupEmpBillEdit.html">鐝粍鑱屽憳娓呭崟</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鐝粍鑱屽憳娓呭崟/Gy_GroupEmpBillList.html">鐝粍鑱屽憳娓呭崟鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏍哥畻鏂瑰紡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjBillList.html">鏍哥畻鏂瑰紡</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjSubBillList.html">鏍哥畻璁板綍</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鏍哥畻鏂瑰紡/Gy_ClassTimePrjGroupBillList.html">鏍哥畻鏂瑰紡缁�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鑰冨嫟姹囨姤鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">鑰冨嫟姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">鑰冨嫟姹囨姤鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>-->
+                        <!--<dd>
+                            <a>鑰冨嫟姹囨姤鍗昣闆呯惇璇�</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html">鑰冨嫟姹囨姤鍗�</a></dd>
+                                <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">鑰冨嫟姹囨姤鍗曞垪琛�</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd>
+                            <a>澶栬喘澧欏竷</a>
+                            <dl class="layui-nav-child">
+                                <dd><a lay-href="宸ヨ祫绠$悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillList.html">澶栬喘澧欏竷宸ヨ祫鍒楄〃</a></dd>
+                                <dd><a lay-href="宸ヨ祫绠$悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillEdit.html">澶栬喘澧欏竷宸ヨ祫</a></dd>
+                            </dl>
+                        </dd>-->
+                        <!--<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/ReportList.html">璁′欢宸ヨ祫鎶ヨ〃</a></dd>-->
+                        <!--<dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/ReportList2.html">鏈堝害宸ヨ祫鎶ヨ〃</a></dd>-->
+                        <!--<dd>
+                                    <a>鎵hˉ璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_DuSubsidyItemBillList.html">鎵hˉ宸ヨ祫璧勬枡鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫绫诲瀷</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkPayTypeBillList.html">宸ヨ祫绫诲瀷鍒楄〃鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ョ鍒嗙被</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/Gy_WorkTypeBillList.html">宸ョ鍒楄〃鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫鎶ヨ〃</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_EmpWorkQtyEntryReport.html">鑱屽憳鏄庣粏鍒嗘瀽</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_PayMentDeptSendList.html">閮ㄩ棬鍙戞斁娓呭崟</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_PayMentDeptYearReport.html">閮ㄩ棬骞村害鍒嗘瀽</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_PayMentSendList.html">宸ヨ祫鍙戞斁娓呭崟</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_PayMentYearReport.html">宸ヨ祫骞存姤琛�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_WorkTimesList.html">鑰冨嫟姹囨�昏〃</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_EmpPayMentSumReport.html">璁′欢宸ヨ祫姹囨�诲垎鏋�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_WorkTimesPayMentEntryReport.html">璁℃椂宸ヨ祫鏄庣粏琛�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_WorkTimesPayMentSumReport.html">璁℃椂宸ヨ祫姹囨�昏〃</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_SingleBalBillEntryReport.html">璁′欢宸ヨ祫鏄庣粏琛�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/宸ヨ祫鎶ヨ〃/Pay_SingleBalBillSumReport.html">璁′欢宸ヨ祫姹囨�昏〃</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>-->
+                        <!--鍙鍖栫湅鏉�-->
+                        <li data-name="template" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="鍙鍖栫湅鏉�" lay-direction="2">
+                                <i class="layui-icon layui-icon-chart-screen"></i>
+                                <cite>鍙鍖栫湅鏉�</cite>
+                            </a>
+                            <dl class="layui-nav-child" style="width:230px;">
+                                <dd>
+                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_CGSH.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>閲囪喘鏀舵枡鐪嬫澘
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_BLPS.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>澶囨枡閰嶉��
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_SCZX.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>鐢熶骇璁″垝鐪嬫澘
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://47.96.97.237/kanbanUi/KBNT/KBNT_JYJD.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>妫�楠岃繘搴︾湅鏉�
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://183.129.128.86:9090/newKanban/KB_ProductionEquipmentOutputAnalysis.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>鐢熶骇璁惧浜ч噺鍒嗘瀽鐪嬫澘
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentUtilizationRate.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>璁惧绋煎姩鐜囩湅鏉�
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentStatus.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>璁惧鐘舵�佺湅鏉�
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://122.227.199.62:5058/HDKanBanUi/SalesDelivery.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>閿�鍞彂璐х湅鏉�
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://122.227.199.62:5058/HDKanBanUi/HDHouse.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>浠撳簱鐘舵�佺湅鏉�
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://47.96.97.237/kanbanUi/HDLackMats.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>缂烘枡棰勮鐪嬫澘
+                                    </a>
+                                </dd>
+                                <dd>
+                                    <a href="http://122.227.199.62:5058/HDKanBanUi/HDCALL.html" target="_blank">
+                                        <i class="layui-icon layui-icon-layer"></i>鍙枡鐪嬫澘
+                                    </a>
+                                </dd>
+                            </dl>
+                        </li>
+                        <!--鍩虹寤烘ā-->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon layui-icon-date"></i><cite>鍩虹寤烘ā</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>鍏敤璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">鐗╂枡鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">鑱屽憳鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">閮ㄩ棬鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">缁勭粐鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">璁¢噺鍗曚綅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">鏈堝害璁剧疆</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">璁㈠崟鍙嶉鐘舵��</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html">宸ヨ壓鍙傛暟鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnitList.html">宸ヨ壓鍙傛暟鍗曚綅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList.html">宸ヨ壓鍙傛暟瀵瑰簲琛ㄥ垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.html">鍖呰鏂瑰紡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html">鏁呴殰绫诲埆</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockStatusList.html">搴撳瓨鐘舵�佸垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_SupplierContactList.html">渚涜揣鏂硅仈绯讳汉鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_COMMONCONTACTList.html">鏀惰揣鏂硅仈绯讳汉鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_PaymentConditionList.html">浠樻鏉′欢鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RecConditionList.html">鏀舵鏉′欢鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxRateList.html">绋庣巼鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RateTypeList.html">姹囩巼鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_CustLocationList.html">浜よ揣鍦扮偣鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html">缁撶畻鏂瑰紡鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MatePriceSup.html">閲囪喘浠锋牸鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Operator.html">涓氬姟鍛樺垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Work.html">浣滀笟鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Staff.html">鍛樺伐鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatus.html">鍣ㄥ叿鐘舵�佸垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_EquipStatus.html">璁惧鐘舵�佸垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxMIX.html">绋庣粍鍚堝垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <!--<dd>
+                                    <a>璁惧鍩虹璧勬枡</a>
+                                    <dl class="layui-nav-child">-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">鐐规椤圭洰</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰鍒楄〃</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">缁翠慨椤圭洰</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰鍒楄〃</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">缁翠慨妫�楠岄」鐩�</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩垪琛�</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">淇濆吇椤圭洰</a></dd>-->
+                                <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMould.html">浜у搧涓庡櫒鍏锋竻鍗�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">浜у搧涓庡櫒鍏锋竻鍗曞垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鐢熶骇璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇宸ヤ綅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔﹀垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd>
+                                        <dd><a href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html" target="main_self_frame">浣滀笟鎸囧涔�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>妫�楠岃祫鏂�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>宸ヨ祫鍩虹璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">宸ヤ綔鏃ュ垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>浜у搧璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQty.html">渚涘簲鍟嗙墿鏂欒祫鏂�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欏垪琛�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏁版嵁瀛楀吀</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html"> 鏁版嵁瀛楀吀(瑙嗗浘)</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html"> 鏁版嵁瀛楀吀(瑙嗗浘)鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>-->
+                            </dl>
+                        </li>
+                        <!-- 绯荤粺绠$悊 -->
+                        <li data-name="set" class="layui-nav-item">
+                            <a><i class="layui-icon  layui-icon-cart"></i><cite>绯荤粺绠$悊</cite></a>
+                            <dl class="layui-nav-child">
+                                <dd>
+                                    <a>鏃ュ父鏌ヨ</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="绯荤粺绠$悊/鏃ュ織绠$悊/Xt_SystemLogList.html">绯荤粺涓婃満鏃ュ織鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/绯荤粺鍙傛暟绠$悊/Xt_SystemParameterList.html">绯荤粺鍙傛暟鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/妯″潡绠$悊/Xt_XtgnbList.html">绯荤粺妯″潡淇℃伅鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">绯荤粺鍗曟嵁绫诲瀷鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅鍒楄〃</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillSubTypeList.html">绯荤粺鍗曟嵁瀛愮被鍨嬫煡璇�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鐢ㄦ埛绠$悊</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserList.html">鐢ㄦ埛鍒楄〃</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserGroupList.html">瑙掕壊鍒楄〃</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByOrg.html">鐢ㄦ埛鍏宠仈缁勭粐</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserStock.html">鐢ㄦ埛鍏宠仈浠撳簱</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByWorkStation.html">鐢ㄦ埛鍏宠仈宸ヤ綅</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserGroup.html">鐢ㄦ埛鍏宠仈鐝粍</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserDept.html">鐢ㄦ埛鍏宠仈閮ㄩ棬</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserEmployee.html">鐢ㄦ埛鍏宠仈鑱屽憳</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByUser.html">鐢ㄦ埛鍏宠仈鐢ㄦ埛</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserWorkCenter.html">鐢ㄦ埛鍏宠仈宸ヤ綔涓績</a></dd>
+                                        <!--<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>-->
+                                        <dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>澶氱骇瀹℃壒</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="绯荤粺绠$悊/澶氱骇瀹℃壒/瀹℃牳椤圭洰/Xt_CheckItemList.html">瀹℃牳椤圭洰鍒楄〃</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/澶氱骇瀹℃壒/瀹℃牳娴佺▼鍗�/Xt_CheckFlowList.html">瀹℃牳娴佺▼鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/澶氱骇瀹℃壒/瀹℃牳娴佺▼鍗�/Xt_CheckUserRight.html">瀹℃壒鐢ㄦ埛鏉冮檺璁剧疆</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyList.html">缁勭粐鏋舵瀯鍒楄〃</a></dd>
+                                    </dl>
+                                </dd>
+                            </dl>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+
+            <!-- 椤甸潰鏍囩 -->
+            <div class="layadmin-pagetabs" id="LAY_app_tabs">
+                <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
+                <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
+                <div class="layui-icon layadmin-tabs-control layui-icon-down">
+                    <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
+                        <li class="layui-nav-item" lay-unselect>
+                            <a href="javascript:;"></a>
+                            <dl class="layui-nav-child layui-anim-fadein">
+                                <dd layadmin-event="closeThisTabs"><a href="javascript:;">鍏抽棴褰撳墠鏍囩椤�</a></dd>
+                                <dd layadmin-event="closeOtherTabs"><a href="javascript:;">鍏抽棴鍏跺畠鏍囩椤�</a></dd>
+                                <dd layadmin-event="closeAllTabs"><a href="javascript:;">鍏抽棴鍏ㄩ儴鏍囩椤�</a></dd>
+                            </dl>
+                        </li>
+                    </ul>
+                </div>
+                <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
+                    <ul class="layui-tab-title" id="LAY_app_tabsheader">
+                        <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
+                    </ul>
+                </div>
+            </div>
+
+
+            <!-- 涓讳綋鍐呭 -->
+            <div class="layui-body" id="LAY_app_body">
+                <div class="layadmin-tabsbody-item layui-show">
+                    <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe>
+                </div>
+            </div>
+
+            <!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
+            <div class="layadmin-body-shade" layadmin-event="shade"></div>
+        </div>
+    </div>
+
+    <script src="../layuiadmin/layui/layui.js"></script>
+
+    <script src="../layuiadmin/zgqCustom/zgqCustom.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>
+        layui.config({
+            base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'user'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util;
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "user/login.html"; });
+            }
+            //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
+            var judgeMorPCflag = judgeMorPC();
+            if (!judgeMorPCflag) {//绉诲姩绔�
+                var dd = '<dd><a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+                $("#append").prepend(dd);
+            }
+            if (!judgeMorPCflag) {//绉诲姩绔�
+                window.location.href = 'index_Mobile.html'
+            }
+
+            $("#LAY_app_flexible").click();           
+
+        });
+
+
+        var timer;
+        var dom;
+        //绉诲叆鏃惰Е鍙戜簨浠�(涓嶅寘鍚瓙鍏冪礌)
+        //fouce.onmouseenter = function (event) {
+        //    dom = $("#LAY_app_flexible").attr('class');
+        //    //鍏抽棴瀹氭椂鍣�
+        //    clearInterval(timer);
+        //    if (dom == "layui-icon layui-icon-spread-left") {
+        //        $("#LAY_app_flexible").click();
+        //    }
+        //}
+        //绉诲嚭鏃惰Е鍙戜簨浠�(涓嶅寘鍚瓙鍏冪礌)
+        fouce.onmouseleave = function (event) {
+            dom = $("#LAY_app_flexible").attr('class');
+            if (dom == "layui-icon layui-icon-shrink-right") {
+                //鍊掕鏃跺叧闂�
+                timer = setTimeout(function () {
+                    $("#LAY_app_flexible").click();
+                }, 10);
+            }
+        }
+
+
+
+        document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
+        document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
+    </script>
+
+    <!--<script>
+    var _hmt = _hmt || [];
+    (function() {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?d214947968792b839fd669a4decaaffc";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+    </script>-->
+</body>
+</html>
\ No newline at end of file
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 5f08a3f..fd38f01 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -203,8 +203,9 @@
                 var PassWord = $("#LAY-user-login-password").val();
                 layer.load(3);
                 $.ajax({
-                    type: "get", 
+                    type: "get",
                     url: GetWEBURL() + "/Web/GetUser",
+                    //async: false,
                     data: { "UserName": UserName, "PassWord": PassWord, "HOrgName": $("#Organization").val() },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -246,8 +247,25 @@
                             //sessionStorage["IP"] = System.Configuration.ConfigurationSettings.AppSettings("name");
                             if (!judgeMorPCflag) {//绉诲姩绔�
                                 window.location.href = '../../views/index_Mobile.html'
-                            } else {//PC绔�
-                                window.location.href = '../../views/index.html'
+                            } else {//PC绔�                               
+                                //鍒ゆ柇鏄惁鏈夊睍寮�鑿滃崟鏍忔潈闄�
+                                $.ajax({
+                                    type: "get",
+                                    url: GetWEBURL() + "/Web/MenuBar",
+                                    //async: false,
+                                    data: { "UserName": sessionStorage["HUserName"] },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            //鏈夋潈闄�
+                                            window.location.href = '../../views/index_Office.html'
+
+                                        } else {
+                                            //鏃犳潈闄�
+                                            window.location.href = '../../views/index.html'
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                })
                             }
                             get_WriteConfigFile();
                         }
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index e6e831a..7b685c7 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -105,8 +105,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
@@ -226,9 +226,11 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd ')}}</div>"  }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
                         , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
                         , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160 }
                         , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
@@ -238,8 +240,6 @@
                         , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 }
                         , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
                         , { field: 'hunitid', title: 'hunitid', width: 115, hide: true }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅'}
@@ -263,15 +263,15 @@
                         , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                         , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd ')}}</div>"  }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 115 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
                         , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
                     ]]
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index e18ee92..67f1415 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -48,8 +48,8 @@
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-MoveStockBill">
                         <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>
+                            <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
+                            <li lay-id="2" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
                             <li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
                             <li lay-id="5" style="padding:1px;">搴撳瓨淇℃伅</li>
@@ -57,7 +57,7 @@
                         </ul>
                         <div class="layui-tab-content">
                             <!--閫夋嫨婧愬崟-->
-                            <div class="layui-tab-item layui-show">                                
+                            <div class="layui-tab-item">                                
                                 <div class="layui-form-item" style="padding:0px;margin:0px;display:none;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -140,7 +140,7 @@
                                 </div>
                             </div>
                             <!--琛ㄥご淇℃伅-->
-                            <div class="layui-tab-item">
+                            <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -152,8 +152,8 @@
                                                 <option value="1243">璋冩嫧鐢宠鍗�</option>
                                                 <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
                                                 <option value="1604">濮斿鐢ㄦ枡娓呭崟</option>
-                                                <option value="1242">鍑哄簱鐢宠鍗�</option>
-                                                <option value="1214">鐢熶骇鍙戞枡閫氱煡鍗�</option>
+                                                <option value="1242">濮斿澶囨枡鍗�</option>
+                                                <option value="1214">鐢熶骇澶囪揣鍗�</option>
                                                 <option value="-1" selected>鎵嬪伐褰曞叆</option>
                                             </select>
                                             <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
@@ -514,13 +514,13 @@
             } else if (HSourceBillType == 1243) { //璋冩嫧鐢宠鍗�
                 $("#HBillType").val(1243);
 
-            } else if (HSourceBillType == 1214) { //鐢熶骇鍙戞枡閫氱煡鍗�
+            } else if (HSourceBillType == 1214) { //鐢熶骇澶囪揣鍗�
                 $("#HBillType").val(1214);
 
             } else if (HSourceBillType == 1604) { //濮斿鐢ㄦ枡娓呭崟
                 $("#HBillType").val(1604);
 
-            } else if (HSourceBillType == 1242) { //鍑哄簱鐢宠鍗�
+            } else if (HSourceBillType == 1242) { //濮斿澶囨枡鍗�
                 $("#HBillType").val(1242);
             } else {
                 $("#HBillType").val(-1);
@@ -585,7 +585,7 @@
                             $("#HBillType").empty();
                             $("#HBillType").val("1242");
                             var optionHtml = '';
-                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '濮斿澶囨枡鍗�' + "</option>";
                             $("#HBillType").append(optionHtml);
                             layui.form.render('select');
                             $("#HBillType").attr("readonly", "readonly");
@@ -594,7 +594,7 @@
                             $("#HBillType").empty();
                             $("#HBillType").val("1214");
                             var optionHtml = '';
-                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇澶囪揣鍗�' + "</option>";
                             $("#HBillType").append(optionHtml);
                             layui.form.render('select');
                             $("#HBillType").attr("readonly", "readonly");
@@ -1172,7 +1172,7 @@
                             }
                             layer.load(3);
 
-                            if (HSourceBillType == 1402 || HSourceBillType == 1214 || HSourceBillType == 1242) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+                            if (HSourceBillType == 1402 || HSourceBillType == 1214 || HSourceBillType == 1242) { //鍙戣揣閫氱煡鍗晐|鐢熶骇澶囪揣鍗�
                                 element.tabChange('tab-MoveStockBill', '2');
                                 //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨嚭浠撳簱涓�
                                 $("#HSCWHNAME").focus();
@@ -1435,7 +1435,7 @@
                                         $("#HBillType").empty();
                                         $("#HBillType").val("1242");
                                         var optionHtml = '';
-                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '濮斿澶囨枡鍗�' + "</option>";
                                         $("#HBillType").append(optionHtml);
                                         layui.form.render('select');
                                         $("#HBillType").attr("readonly", "readonly");
@@ -1444,7 +1444,7 @@
                                         $("#HBillType").empty();
                                         $("#HBillType").val("1214");
                                         var optionHtml = '';
-                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇澶囪揣鍗�' + "</option>";
                                         $("#HBillType").append(optionHtml);
                                         layui.form.render('select');
                                         $("#HBillType").attr("readonly", "readonly");
@@ -1607,7 +1607,7 @@
                                 //element.tabChange('tab-POStockInBill', '2');
                                 //鎵皟鍏ヤ粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
                                 $("#HBarCode").focus();
-                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇澶囪揣鍗�
                                     element.tabChange('tab-MoveStockBill', '2');
                                     //鎵皟鍏ヤ粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
                                     $("#HBarCode").focus();
@@ -1647,7 +1647,7 @@
                                 //element.tabChange('tab-POStockInBill', '2');
                                 //鎵皟鍑轰粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨叆浠撳簱涓�
                                 $("#HWHNAME").focus();
-                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+                                if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇澶囪揣鍗�
                                     element.tabChange('tab-MoveStockBill', '2');
                                     //鎵皟鍑轰粨搴撴垚鍔熷悗锛屽厜鏍囨樉绀哄埌璋冨叆浠撳簱涓�
                                     $("#HWHNAME").focus();
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index 10dc89d..4463461 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -112,8 +112,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
@@ -234,20 +234,6 @@
                         ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                        , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
-                        , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 }
-                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
-                        , { field: 'HMangerID', title: 'HMangerID', width: 200, hide: true }
-                        , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 200 }
-                        , { field: '涓荤', title: '涓荤', width: 200 }
-                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
-                        , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
-                        , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160 }
-                        , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
-                        , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 }
-                        , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
-                        , { field: '鎽樿', title: '鎽樿', width: 200 }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
                         // , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
                         , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
@@ -264,10 +250,24 @@
                         , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 115 }
                         , { field: '璋冨嚭浠撳簱浠g爜', title: '璋冨嚭浠撳簱浠g爜', width: 200 }
                         , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 200 }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 115 }
                         , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                         , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
+                        , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 }
+                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
+                        , { field: 'HMangerID', title: 'HMangerID', width: 200, hide: true }
+                        , { field: '涓荤浠g爜', title: '涓荤浠g爜', width: 200 }
+                        , { field: '涓荤', title: '涓荤', width: 200 }
+                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+                        , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
+                        , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160 }
+                        , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
+                        , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 }
+                        , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 115 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
@@ -420,6 +420,51 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鍗曚环':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '閲戦':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '棰嗘枡浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 180;
+                                            break;
+                                        case '浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '棰嗘枡鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '涓荤':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '閮ㄩ棬':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 5cc0b31..11fa387 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -44,8 +44,8 @@
                                 <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
                                 <button type="button" class="layui-btn" id="ToolReset" lay-submit="" lay-filter="ToolReset">閲嶇疆</button>
                                 <button type="button" class="layui-btn" id="ToolStock" lay-submit="" lay-filter="ToolStock">搴撳瓨</button>
-                                <button type="button" class="layui-btn" id="ToolSynch" lay-submit="" lay-filter="ToolSynch">鍚屾璧勬枡</button>
-                                <button type="button" class="layui-btn" id="ToolBatch" lay-submit="" lay-filter="ToolBatch">鎵规</button>
+                                <!--<button type="button" class="layui-btn" id="ToolSynch" lay-submit="" lay-filter="ToolSynch">鍚屾璧勬枡</button>
+                                <button type="button" class="layui-btn" id="ToolBatch" lay-submit="" lay-filter="ToolBatch">鎵规</button>-->
                                 <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
                             </div>
                         </div>
@@ -56,14 +56,14 @@
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
-                                            <div class="layui-inline">
+                                            <div class="layui-inline" style="display:none">
                                                 <label class="layui-form-label">缁勭粐</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px">
                                                     </select>
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-inline" style="display:none">
                                                 <label class="layui-form-label">宸ュ巶浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
@@ -71,28 +71,20 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" readonly>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-inline">
                                                 <label class="layui-form-label">婧愬崟绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" class="layui-input" value="" style="float:left;width:150px">
                                                         <option value="1">鐢熶骇璁㈠崟</option>
-                                                        <option value="2">鐢熶骇姹囨姤鍗�</option>
-                                                        <option value="3">閲囪喘璁㈠崟</option>
+                                                        <!--<option value="2">鐢熶骇姹囨姤鍗�</option>
+                                                        <option value="3">閲囪喘璁㈠崟</option>-->
                                                         <option value="4">鏀舵枡閫氱煡鍗�</option>
-                                                        <option value="5">濮斿璁㈠崟</option>
+                                                        <!--<option value="5">濮斿璁㈠崟</option>
                                                         <option value="6">閫�璐ч�氱煡鍗�</option>
                                                         <option value="7">鍏朵粬鍏ュ簱鍗�</option>
                                                         <option value="8">鐩存帴璋冩嫧鍗�</option>
                                                         <option value="9">閲囪喘閫�鏂欏崟</option>
                                                         <option value="10">鐢熶骇閫�鏂欏崟</option>
-                                                        <option value="11">缁勮鎷嗗嵏鍗�</option>
+                                                        <option value="11">缁勮鎷嗗嵏鍗�</option>-->
                                                     </select>
                                                 </div>
                                             </div>
@@ -106,6 +98,15 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            
+                                            <div class="layui-inline" style="display:none">
                                                 <label class="layui-form-label">鏉$爜绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
@@ -463,7 +464,7 @@
                     title: '' + getSupType() + '鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
-                    area: ['95%', '80%'],
+                    area: ['95%', '95%'],
                     maxmin: true,
                     content: [url, 'yes'],
                     btn: ['纭畾', '鍙栨秷']
@@ -630,7 +631,7 @@
                     title: '鐗╂枡璧勬枡',
                     closeBtn: 1,
                     shift: 2,
-                    area: ['80%', '80%'],
+                    area: ['95%', '95%'],
                     maxmin: true,
                     content: ['../../PublicPage/MaterialInfo.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
@@ -642,7 +643,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+                        checkStatus.data[0].鏁伴噺 = checkStatus.data[0].鏁伴噺.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟 
+
+                        var arr = [{ HBillNo: '', HMaterID: checkStatus.data[0].HMaterID,HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: checkStatus.data[0].瑙勬牸鍨嬪彿, HAuxPropNumber: checkStatus.data[0].杈呭姪灞炴�т唬鐮�, HAuxPropName: checkStatus.data[0].杈呭姪灞炴�у悕绉�, HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: checkStatus.data[0].鎵规, HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺, HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         table.reload('mainTable', {
                             data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -897,25 +900,27 @@
                     , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
                     , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
                     , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
-                    , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
                     , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
                     , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
                     , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+                    , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                    , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+                    , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+                    , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
                     , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
                     , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
                     , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
                     , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
                     , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
-                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
-                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
                     , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
                     , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
-                    , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
-                    , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
                     , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
                     , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
                     , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
@@ -936,8 +941,6 @@
                     , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
                     , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
                     , { field: '澶囨敞', title: '澶囨敞', width: 120 }
-                    , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
                     , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
                     , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
                     , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 39a4805..29219d1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -93,6 +93,7 @@
                                 <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-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></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="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
                             </div>
@@ -167,6 +168,9 @@
                         break;
                     //鎵撳嵃
                     case 'set_Print': set_Print();
+                        break;
+                    //涓�閿墦鍗�
+                    case 'set_Print_Convenient': set_Print_Convenient();
                         break;
                     //閫�鍑烘寜閽�
                     case 'btn-Close':
@@ -514,7 +518,7 @@
 
                     layer.open({
                         type: 2
-                        , area: ['50%', '50%']
+                        , area: ['85%', '85%']
                         , title: '鎵撳嵃妯$増閫夋嫨'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -528,6 +532,40 @@
                 }
             }
 
+            //涓�閿墦鍗�
+            function set_Print_Convenient() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length >= 1) {
+                    var rows = [];
+                    for (var i = 0; i < data.length; i++) {
+                        rows.push(data[i].HItemID.toString());
+                    }
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HEmployee' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("./HBarPlanPrint.html?linterid=" + rows.toString() + "&Type=" + 'HEmployee' + "&OpenTmp=" + OpenTmp.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 76503f2..188b5e0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -354,7 +354,7 @@
             function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
-                var HModel = $("#HModel").val();
+                var HModel = $("#HModel").val().replace('筛', '');
                 var HOrgName = $("#HOrgName").val();
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index e07b2d4..1208968 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -93,6 +93,7 @@
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
 
@@ -157,6 +158,9 @@
                         break;
                     //鎵撳嵃
                     case 'set_Print': set_Print();
+                        break;
+                    //涓�閿墦鍗�
+                    case 'set_Print_Convenient': set_Print_Convenient();
                         break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': parent.layui.admin.events.closeThisTabs();
@@ -474,7 +478,7 @@
 
                     layer.open({
                         type: 2
-                        , area: ['50%', '50%']
+                        , area: ['85%', '85%']
                         , title: '鎵撳嵃妯$増閫夋嫨'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -488,6 +492,40 @@
                 }
             }
 
+            //涓�閿墦鍗�
+            function set_Print_Convenient() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length >= 1) {
+                    var rows = [];
+                    for (var i = 0; i < data.length; i++) {
+                        rows.push(data[i].HItemID.toString());
+                    }
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HWarehouse' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("./HBarPlanPrint.html?linterid=" + rows.toString() + "&Type=" + 'HWarehouse' + "&OpenTmp=" + OpenTmp.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index a094696..e60d388 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -574,6 +574,21 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '宸ヤ綔涓績浠g爜':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '宸ヤ綔涓績鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '缁勭粐':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '澶囨敞':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 4ab7ff0..563fe04 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -183,6 +183,20 @@
                     CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + "_Sub.grf", "xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx?linterid=" + ListTrue[0], true, "");
                 }
                 break;
+            case "HProcessExchanges"://宸ュ簭娴佽浆鍗¤〃浣撴墦鍗�
+                var ListTrue = value.split('@');
+                var linterid = ListTrue[0];//涓籭d
+                var subid = ListTrue[1].split(',');//瀛恑d鏁扮粍
+
+                var subids = '';//瀛恑d
+
+                for (let i = 0; i < subid.length; i++) {
+                    subids += subid[i] + ',';
+                }
+                subids = subids.substring(subids.length - 1, 0);
+
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillLists.aspx?linterid=" + linterid + "&subids=" + subids, true, "");
+                break;
             case "HPPickingBill"://鐢熶骇棰嗘枡鎷嗙爜鍒楄〃
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_HPPickingBillList.aspx?linterid=" + value, true, "");
                 break;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx"
new file mode 100644
index 0000000..27b7427
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx"
@@ -0,0 +1,27 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_ProcessExchangeBillLists" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <script runat="server"> 
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //鈽呯壒鍒彁绀衡槄锛�
+            //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+            //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+            SqlXMLReportData.GenEntireData(this, "select  b.娴佹按鍙�,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠g爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸 as 瀛愪欢瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,a.鍗曟嵁鍙� + '&' + ltrim(b.HEntryID) 鏉$爜缂栧彿 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid="+Request.Params["linterid"] + " and b.hsubid in ("+ Request.Params["subids"] +") order by cast(b.娴佹按鍙� as int)","select 1");
+        }
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs"
new file mode 100644
index 0000000..1fcbccb
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+    public partial class xmlLBM_Sc_ProcessExchangeBillLists : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.designer.cs"
new file mode 100644
index 0000000..87c6c27
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillLists.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+    public partial class xmlLBM_Sc_ProcessExchangeBillLists
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
index 60b8c2d..78d0fa3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -107,7 +107,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鎵�灞為儴闂�</label>
+                                            <label class="layui-form-label">鎵�灞為儴闂�<span style="color:red;">*</span></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                 <input type="hidden" name="HDeptID" id="HDeptID" value="0">
@@ -283,27 +283,46 @@
                 $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HUpDater").val(sessionStorage["HUserName"]);
                 GetProcPriceValue(linterid);
-            } else if (OperationType == 5) {
-                OperationType = 2;
+            } else if (OperationType == 2) {
+                var urldata = decodeURI(location.search.substr(1));
+                var arr = urldata.split('&');           
 
-                var HMaterID = params[params[2]];
-                var HNumber =  params[params[3]];
-                var HName = unescape(getQueryString(params[params[4]]));
-                var HModel = params[params[5]];
-                var HProcId = params[params[6]];
-                var HProcNumber = params[params[7]];
-                var HProcName = params[params[8]];
+                var HMaterID = arr[2].split('=')[1];
+                var HNumber = arr[3].split('=')[1];
+                var HName = arr[4].split('=')[1];
+                var HModel = arr[5].split('=')[1];
+                var HProcId = arr[6].split('=')[1];
+                var HProcNumber = arr[7].split('=')[1];
+                var HProcName = arr[8].split('=')[1];
 
+                var ajaxLoad = layer.load();
                 var rowdata = [];
 
-                rowdata.push({
-                    "HMaterIDCol": HMaterID, "HMaterNumberCol": HNumber, "HMaterNameCol": HName, "HMaterModelCol": HModel, "HProcIDCol": HProcId,
-                    "HProcNumberCol": HProcNumber, "HProcNameCol": HProcName
-                });
-                
-                option.data = rowdata;
-                table.render(option);
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_RoutingBill/EditPrice',
+                    type: "GET",
+                    data: { "HMaterNumber": HNumber },
+                    success: function (data) {
+                        if (data.count == 1) {
+                            for (let i = 0; i < data.data.length; i++) {
+                                rowdata.push({
+                                    "HMaterIDCol": data.data[i].HMaterID, "HMaterNumberCol": data.data[i].HNumber, "HMaterNameCol": data.data[i].HName, "HMaterModelCol": data.data[i].HModel, "HProcIDCol": data.data[i].HProcID,
+                                    "HProcNumberCol": data.data[i].HProcNumber, "HProcNameCol": data.data[i].HProcName, "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": ""
+                                });
 
+                                option.data = rowdata;
+                                table.render(option);
+                            }                           
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data.code + data.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });                
             }            
 
             if (linterid == undefined) {
@@ -577,16 +596,6 @@
                 set_SaveBill(data);
             });
 
-            //瑙e喅浼犲弬涓枃涔辩爜
-            function getQueryString(name) {
-                var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-                var r = window.location.search.substr(1).match(reg);
-                if (r != null) {
-                    return unescape(r[2]);
-                }
-                return null;
-            }
-
             //淇濆瓨
             function set_SaveBill(data) {
                 //鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
@@ -596,6 +605,12 @@
                         table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                         num.push(table.cache["mainTable"][i])
                     }
+                }
+
+                var HDepName = $("#HDeptName").val();
+                if (!HDepName) {
+                    layer.msg("琛ㄥご閮ㄩ棬涓嶈兘涓虹┖锛�");
+                    return;
                 }
 
                 var sSubTable = num;
@@ -616,6 +631,7 @@
                         return;
                     }
                 }
+
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
@@ -780,15 +796,15 @@
                     , cols: [[ 
                         { type: 'checkbox' }
                         , { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
-                        , { field: 'HMaterNumberCol', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterCheck", width: 200 }
-                        , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
-                        , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
+                        , { field: 'HMaterNumberCol', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterCheck", width: 160 }
+                        , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:160 }
+                        , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 160 }
                         , { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
                         , { field: 'HProcNumberCol', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
                         , { field: 'HProcNameCol', title: '宸ュ簭鍚嶇О' }
-                        , { field: 'HSourceIDCol', title: '璧勬簮ID', edit: 'text', hide: true }
-                        , { field: 'HSourceNumberCol', title: '璧勬簮浠g爜', edit: 'text', event: "HSourceCheck" }
-                        , { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
+                        , { field: 'HSourceIDCol', title: '宸ヤ綅ID', edit: 'text', hide: true }
+                        , { field: 'HSourceNumberCol', title: '宸ヤ綅浠g爜', edit: 'text', event: "HSourceCheck" }
+                        , { field: 'HSourceNameCol', title: '宸ヤ綅鍚嶇О' }
                         , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
                         , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', event: "HBeginDateCol" }
                         , { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', event: "HEndDateCol" }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 611f3f6..03b9cb2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -34,6 +34,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
                         </div>
                     </div>
@@ -47,20 +48,37 @@
                                 <div class="layui-tab-item layui-show">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">宸ュ簭浠g爜*</label>
+                                            <label class="layui-form-label">宸ュ簭浠g爜<span style="color:red;">*</span></label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                 <input id="HItemID" name="HItemID" type="hidden" />
-
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">宸ュ簭鍚嶇О*</label>
+                                            <label class="layui-form-label">姹囨姤绫诲瀷</label>
+                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item">
+                                                        <select name="HType" id="HType">
+                                                            <option value="">璇烽�夋嫨绫诲瀷</option>
+                                                            <option value="璁惧">璁惧</option>
+                                                            <option value="娴佹按绾�" selected>娴佹按绾�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭鍚嶇О<span style="color:red;">*</span></label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">
 
                                             </div>
-                                        </div>
+                                        </div>                                        
+                                    </div>                                    
+                                </div>
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">宸ヤ綔涓績*</label>
                                             <div class="layui-input-inline">
@@ -92,43 +110,26 @@
                                                 <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-inline">
-                                        <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
-                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                            <div class="layui-form">
-                                                <div class="layui-form-item" style=" width: 375%;">
-                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                    </select>
+                                        <div class="layui-col-xs8 layui-inline" style="display:none">
+                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item" style=" width: 375%;">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                        </select>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                        <div class="layui-input-inline">
-                                            <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
-                                            <input type="hidden" value="false" name="HStopflag" id="HStopflag">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-tab-item">
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">姹囨姤绫诲瀷</label>
-                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                            <div class="layui-form">
-                                                <div class="layui-form-item">
-                                                    <select name="HType" id="HType">
-                                                        <option value="">璇烽�夋嫨绫诲瀷</option>
-                                                        <option value="璁惧">璁惧</option>
-                                                        <option value="娴佹按绾�">娴佹按绾�</option>
-                                                    </select>
-                                                </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                             </div>
                                         </div>
                                     </div>
-
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鐝骇瀹氶</label>
@@ -159,16 +160,6 @@
                                                 <input type="text" name="HSno" id="HSno" lay-verify="" autocomplete="off" value="0" class="layui-input">
                                             </div>
                                         </div>
-                                        <!--<div class="layui-col-xs4 layui-inline">
-                    <label class="layui-form-label">宸ユ</label>
-                    <div class="layui-input-inline">
-                        <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
-                        <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" 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-xs4 layui-inline">
@@ -187,16 +178,6 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <!--<div class="layui-col-xs4 layui-inline">
-                    <label class="layui-form-label">ERP宸ュ簭</label>
-                    <div class="layui-input-inline">
-                        <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float:left;width:150px;">
-                        <input type="hidden" name="HProcessID_K3" id="HProcessID_K3" value="0">
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" 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">
 
@@ -303,8 +284,7 @@
                             </div>
                         </div>
                     </div>
-                 </div>
-            </form>
+                </form>
             </div>
         </div>
     </div>
@@ -454,6 +434,13 @@
                 set_SaveBill(data);
             });
 
+            //鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('Add_Edit_Gy_Process.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                });
+            })
+
             //#endregion
 
 
@@ -529,41 +516,41 @@
                                 "HNumber": data.宸ュ簭浠g爜
                                 , "HItemID": data.HItemID
                                 , "HName": data.宸ュ簭鍚嶇О
-                                , "HFixPrice": data.鐝骇瀹氶
-                                , "HLevel": data.绛夌骇
-                                //, "HProcMulName": data.宸ユ鍚嶇О
-                                //, "HProcMulID": data.宸ユID
-                                , "HBarCodeForBase": data.鏉″舰鐮�
-                                , "HHelpCode": data.鍔╄鐮�
-                                , "HDeptName": data.閮ㄩ棬
-                                , "HDeptID": data.HDeptID
-                                , "HDeptNumber": data.閮ㄩ棬浠g爜
-                                , "HOverFixPrice": data.鍔犵彮琛ヨ创瀹氶
-                                , "HSno": data.搴忓彿
+                                //, "HFixPrice": data.鐝骇瀹氶
+                                //, "HLevel": data.绛夌骇
+                                ////, "HProcMulName": data.宸ユ鍚嶇О
+                                ////, "HProcMulID": data.宸ユID
+                                //, "HBarCodeForBase": data.鏉″舰鐮�
+                                //, "HHelpCode": data.鍔╄鐮�
+                                //, "HDeptName": data.閮ㄩ棬
+                                //, "HDeptID": data.HDeptID
+                                //, "HDeptNumber": data.閮ㄩ棬浠g爜
+                                //, "HOverFixPrice": data.鍔犵彮琛ヨ创瀹氶
+                                //, "HSno": data.搴忓彿
                                 //, "HProcessName_K3": data.ERP宸ュ簭鍚嶇О
                                 //, "HProcessID_K3": data.ERP宸ュ簭ID
                                 , "HType": data.姹囨姤绫诲瀷
-                                , "HStopflag": data.绂佺敤鏍囪
-                                , "HTypeFlow": data.娴佽浆鏍囪
-                                , "HTypeCount": data.鏍哥畻鏍囪
-                                , "HAutoTrunFlag": data.鑷姩绉昏浆
-                                , "HRemark": data.澶囨敞
-                                , "HProcCheckNote": data.鏈伐搴忕‘璁よ褰�
-                                , "HUSEORGID": data.HUSEORGID
-                                , "HBadWHID": data.HBadWHID
-                                , "HBadWHName": data.HBadWHName
-                                , "HWasterWHID": data.HWasterWHID
-                                , "HWasterWHName": data.HWasterWHName
-                                , "HBadCountDevelopWHID": data.HBadCountDevelopWHID
-                                , "HBadCountDevelopWHName": data.HBadCountDevelopWHName
-                                , "HWWBadWHID": data.HWWBadWHID
-                                , "HWWBadWHName": data.HWWBadWHName
-                                , "HWWWasterWHID": data.HWWWasterWHID
-                                , "HWWWasterWHName": data.HWWWasterWHName
-                                , "HWHID": data.HWHID
-                                , "HWHName": data.HWHName
-                                , "HWorkCenterID": data.HWorkCenterID
-                                , "HWorkCenterName": data.HWorkCenterName
+                                //, "HStopflag": data.绂佺敤鏍囪
+                                //, "HTypeFlow": data.娴佽浆鏍囪
+                                //, "HTypeCount": data.鏍哥畻鏍囪
+                                //, "HAutoTrunFlag": data.鑷姩绉昏浆
+                                //, "HRemark": data.澶囨敞
+                                //, "HProcCheckNote": data.鏈伐搴忕‘璁よ褰�
+                                //, "HUSEORGID": data.HUSEORGID
+                                //, "HBadWHID": data.HBadWHID
+                                //, "HBadWHName": data.HBadWHName
+                                //, "HWasterWHID": data.HWasterWHID
+                                //, "HWasterWHName": data.HWasterWHName
+                                //, "HBadCountDevelopWHID": data.HBadCountDevelopWHID
+                                //, "HBadCountDevelopWHName": data.HBadCountDevelopWHName
+                                //, "HWWBadWHID": data.HWWBadWHID
+                                //, "HWWBadWHName": data.HWWBadWHName
+                                //, "HWWWasterWHID": data.HWWWasterWHID
+                                //, "HWWWasterWHName": data.HWWWasterWHName
+                                //, "HWHID": data.HWHID
+                                //, "HWHName": data.HWHName
+                                //, "HWorkCenterID": data.HWorkCenterID
+                                //, "HWorkCenterName": data.HWorkCenterName
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -587,23 +574,7 @@
                 if ($("#HName").val() == "") {
                     layer.msg("璇疯緭鍏ュ伐搴忓悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
-                }
-                //if (!$("#HType").val()) {
-                //    layer.msg("璇烽�夋嫨姹囨姤绫诲瀷锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return;
-                //}
-                //if (!$("#HProcMulID").val()) {
-                //    layer.msg("璇烽�夋嫨宸ユ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return;
-                //}
-                if ($("#HWorkCenterName").val() == "") {
-                    layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                //if (!$("#HProcessID_K3").val()) {
-                //    layer.msg("璇烽�夋嫨ERP宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return;
-                //}
+                }              
 
                 var HFixPrice = $('#HFixPrice').val();
                 if (HFixPrice.substring(HFixPrice.length - 1, HFixPrice.length) == ".") {
@@ -644,7 +615,7 @@
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr + ";" + sessionStorage["HUserName"] },
                     dataType: "json",
@@ -662,8 +633,9 @@
                     },
                     error: function (err) {
                         layer.alert("閿欒:" + err, { icon: 5 });
+                        //console.log("Reason" + sMainStr);
                     }
-                });
+                });                
             }
             //#endregion
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 2e294a9..4047575 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -33,6 +33,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
                         </div>
                     </div>
@@ -45,59 +46,29 @@
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
                                     <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">鐢熶骇璧勬簮浠g爜*</label>
+                                        <label class="layui-form-label">鐢熶骇宸ヤ綅浠g爜<span style="color:red;">*</span></label>
                                         <div class="layui-input-inline">
                                             <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                             <input id="HItemID" name="HItemID" type="hidden" />
                                         </div>
                                     </div>
                                     <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">鐢熶骇璧勬簮鍚嶇О*</label>
+                                        <label class="layui-form-label">鐢熶骇宸ヤ綅鍚嶇О<span style="color:red;">*</span></label>
                                         <div class="layui-input-inline">
                                             <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                         </div>
-                                    </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">宸ヤ綔涓績*</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
-                                            <input type="hidden" name="HCenterID" id="HCenterID" value="0">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">
-                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                            </button>
+                                    </div>      
+                                    <div class="layui-col-xs8 layui-inline">
+                                        <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                        <div class="layui-input-block">
+                                            <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 86.5%;">
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">鍔╄鐮�</label>
-                                        <div class="layui-input-inline">
-                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">mac鍦板潃</label>
-                                        <div class="layui-input-inline">
-                                            <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
-                                        </div>
-                                    </div>
-
+                                </div>
+                                <div class="layui-tab-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
-                                            <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-inline">
-                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
-                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs8 layui-inline">
-                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐</label>
                                             <div class="layui-input-inline" style="margin-bottom: -15px;">
                                                 <div class="layui-form">
                                                     <div class="layui-form-item" style="width: 375%;">
@@ -109,8 +80,39 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ヤ綔涓績</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" 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-xs4 layui-inline">
+                                            <label class="layui-form-label">鍔╄鐮�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">mac鍦板潃</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">                                        
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍗曠彮宸ユ椂</label>
@@ -314,6 +316,13 @@
                 set_SaveBill(data);
             });
 
+            //鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('Add_Edit_Gy_Source.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                });
+            })
+
         //#endregion
 
 
@@ -418,11 +427,7 @@
                 if ($("#HName").val() == "") {
                     layer.msg("璇疯緭鍏ョ敓浜ц祫婧愬悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
-                }
-                if ($("#HWorkCenterName").val() == "") {
-                    layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                }              
 
                 var HWorkTimes = $('#HWorkTimes').val();
                 if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index ff2fe13..28ce10a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -527,6 +527,21 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '宸ュ簭浠g爜':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '宸ュ簭鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '缁勭粐':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;
+                                        case '澶囨敞':
+                                            option.cols[0][i + 1]["width"] = 286;
+                                            break;                                      
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 3324e60..c3ab475 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -360,25 +360,27 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var ItemID = data[0].HItemID.toString();
-                    var ajaxLoad = layer.load();
-                    //閫昏緫鍒犻櫎鏂规硶
-                    $.ajax({
-                        url: GetWEBURL() + 'DeltetGy_Source',
-                        type: "GET",
-                        data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { icon: 1 });
-                                get_FastQuery(1);
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var ajaxLoad = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_Source',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    get_FastQuery(1);
+                                    layer.close(ajaxLoad);
+                                } else {
+                                    layer.close(ajaxLoad);
+                                    layer.alert(result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
                                 layer.close(ajaxLoad);
-                            } else {
-                                layer.close(ajaxLoad);
-                                layer.alert(result.Message, { icon: 5 });
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                             }
-                        }, error: function () {
-                            layer.close(ajaxLoad);
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
+                        });
                     });
                 }
                 else {
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\347\256\241\347\220\206/Gy_BarCodeBillList.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\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 72ca332..519972b 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\347\256\241\347\220\206/Gy_BarCodeBillList.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\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -93,6 +93,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
@@ -122,7 +123,7 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["鍗曟嵁ID", "HMaterID", "HDeptID", "HSupID","HAuxPropID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
 
             var HModName = "Gy_BarCodeBillList";
@@ -190,7 +191,7 @@
                             rows = rows.substring(rows.length - 1, 0);
                             layer.open({
                                 type: 2
-                                , area: ['50%', '50%']
+                                , area: ['85%', '85%']
                                 , title: '鎵撳嵃妯$増閫夋嫨'
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -202,6 +203,9 @@
                         else {
                             layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
                         }
+                        break;
+                    case 'set_Print_Convenient':
+                        set_Print_Convenient();
                         break;
                     //鍒锋柊
                     case 'btn-reload':
@@ -295,6 +299,12 @@
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 250 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 250 }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160 }
+                        , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
+                        , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115 }
+                        , { field: '杞﹂棿', title: '杞﹂棿', width: 115 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
                         , { field: '鐐夊彿', title: '鐐夊彿', width: 200 }
@@ -303,14 +313,11 @@
                         , { field: '鍘傚晢', title: '鍘傚晢', width: 200 }
                         , { field: '鎹嗗寘鍙�', title: '鎹嗗寘鍙�', width: 200 }
                         , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 200, templet: "<div>{{d.鐢熶骇鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200 }
+                         , { field: '淇濊川鏈熻嚦', title: '淇濊川鏈熻嚦', width: 200, templet: "<div>{{d.淇濊川鏈熻嚦 ==null ?'':layui.util.toDateString(d.淇濊川鏈熻嚦, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                         , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200, hide: true }
                         , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160 }
                         , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160 }
-                        , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160 }
-                        , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
                         , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200 }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
                         , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                         , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
                         , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
@@ -319,13 +326,10 @@
                         , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115 }
                         , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
                         , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                        , { field: '杞﹂棿', title: '杞﹂棿', width: 115 }
                         , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200 }
                         , { field: '鎷栧彿', title: '鎷栧彿', width: 200 }
                         , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200 }
                         , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                        , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115 }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
                         , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200 }
                         , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200 }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115 }
@@ -366,6 +370,39 @@
                 DisPlay_HideColumn();
             }
 
+            //涓�閿墦鍗�
+            function set_Print_Convenient() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length >= 1) {
+                    var rows = [];
+                    for (var i = 0; i < data.length; i++) {
+                        rows.push(data[i].HItemID.toString());
+                    }
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HGy_BarCodeBill' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + rows.toString() + "&Type=" + 'HGy_BarCodeBill' + "&OpenTmp=" + OpenTmp.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
 
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
@@ -418,6 +455,26 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 170;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鏁伴噺':
+                                            option.cols[0][i + 1]["width"] = 80;
+                                            break;
+                                        case '鏉$爜缂栧彿':
+                                            option.cols[0][i + 1]["width"] = 200;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                    }                                   
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
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\347\256\241\347\220\206/Gy_BarCodeBill_OutList.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\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
index 94c1cf7..a7905c6 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\347\256\241\347\220\206/Gy_BarCodeBill_OutList.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\347\256\241\347\220\206/Gy_BarCodeBill_OutList.html"
@@ -72,8 +72,8 @@
                         <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="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></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_Edit"><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>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index bd48a77..4a1923a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -27,65 +27,61 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <div class="layui-row">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HModel" id="HModel">
-                                        </div>
-                                    </div>                                   
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">涓氬姟鐘舵��</label>
-                                        <div class="layui-input-block">
-                                            <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
-                                                <!--  <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
-                                                <option value="寮�宸�">寮�宸�</option>
-                                                <option value="璁″垝">璁″垝</option>
-                                                <option value="璁″垝纭">璁″垝纭</option>
-                                                <option value="涓嬭揪">涓嬭揪</option>
-
-                                                <option value="0">鍏ㄩ儴</option>
-                                                <option value="瀹屽伐">瀹屽伐</option>
-                                                <option value="缁撴">缁撴</option>
-                                            </select>
-
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
-                                        <div class="layui-input-block" style="margin-top:10px">
-                                            <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
-                                                <!--  <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
-                                                <option value="鍏ㄩ儴">鍏ㄩ儴</option>
-                                                <option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
-                                                <option value="鏈笅鎺�" selected="selected">鏈笅鎺�</option>
-                                            </select>
-                                        </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
                                 </div>
-                                <div class="layui-row">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鐢熶骇杞﹂棿</label>
-                                        <div class="layui-input-block">
-                                            <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">涓氬姟鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
+                                            <!--  <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+                                            <option value="寮�宸�">寮�宸�</option>
+                                            <option value="璁″垝">璁″垝</option>
+                                            <option value="璁″垝纭">璁″垝纭</option>
+                                            <option value="涓嬭揪">涓嬭揪</option>
 
-                                                <!--鍔ㄦ�佹覆鏌撹溅闂�-->
-                                            </select>
-                                        </div>
+                                            <option value="0">鍏ㄩ儴</option>
+                                            <option value="瀹屽伐">瀹屽伐</option>
+                                            <option value="缁撴">缁撴</option>
+                                        </select>
+
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
-                                        </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>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏄惁涓嬫帹鐢熸垚娴佽浆鍗�</label>
+                                    <div class="layui-input-block" style="margin-top:10px">
+                                        <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
+                                            <!--  <option value="鍏ㄩ儴">鍏ㄩ儴</option>-->
+                                            <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+                                            <option value="宸蹭笅鎺�">宸蹭笅鎺�</option>
+                                            <option value="鏈笅鎺�" selected="selected">鏈笅鎺�</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="margin-left:80px;">
+                                    <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block">
+                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+                                    </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-colla-content">
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                             <div class="layui-input-block">
@@ -104,7 +100,7 @@
                                                 <input type="text" class="layui-input" name="HERPID" id="HERPID">
                                             </div>
                                         </div>
-                                    </div>                                   
+                                    </div>
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -126,6 +122,7 @@
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
                                                 <option value="10">涓嶅寘鍚�</option>
+                                                <option value="11">涓虹┖</option>
                                             </select>
                                         </div>
                                         <div class="layui-inline">
@@ -160,11 +157,11 @@
                         <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="set_ShowBill"><i class="layui-icon layui-icon-form"></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="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>
                                 <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_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></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_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
@@ -176,7 +173,7 @@
                                 <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="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel瀵煎叆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
                             </div>
                         </script>
                     </form>
@@ -435,12 +432,13 @@
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
-                        , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
-                        , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
-                        , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
-                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                        , { field: '宸ヨ壓璺嚎浠g爜', title: '宸ヨ壓璺嚎浠g爜'}
                         , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
                         , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115, totalRow: true }
+                        , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
+                        //, { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
+                        , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
                         , { field: '鍖呰鏍囪瘑浠g爜', title: '鍖呰鏍囪瘑浠g爜', width: 115 }
                         , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 115 }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
@@ -449,10 +447,10 @@
                         , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
                         , { field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�' }
                         , { field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�' }
-                        , { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
-                        , { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
-                        , { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
+                        //, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
+                        //, { field: '璁″垝鐢熶骇鏁伴噺', title: '璁″垝鐢熶骇鏁伴噺' }
+                        //, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+                        //, { field: '鏈叧鑱旀暟閲�', title: '鏈叧鑱旀暟閲�' }
                         , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
@@ -470,7 +468,7 @@
                         , { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
                         , { field: '閿�鍞墿鏂欏悕绉�', title: '閿�鍞墿鏂欏悕绉�', sort: true, width: 200 }
                         , { field: '鍖呰鏂瑰紡', title: '鍖呰鏂瑰紡', sort: true, width: 150 }
-                        , { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
+                        //, { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
                         , { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
                         , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
                         //, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
@@ -489,7 +487,6 @@
                         //, { field: 'hbomid', title: 'hbomid' , hide: true}
                         //, { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
                         //, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
-                        , { field: '宸ヨ壓璺嚎浠g爜', title: '宸ヨ壓璺嚎浠g爜'}
                         , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎'}
                         //, { field: 'hsubid', title: 'hsubid' , hide: true}
                         //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
@@ -565,6 +562,9 @@
                             break;
                         case "10":
                             com = "not like'%" + ColContent + "%'";
+                            break;
+                        case "11":
+                            com = " is null";
                             break;
                         default:
                             com = "" + Comparator + "'" + ColContent + "'";
@@ -681,7 +681,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+                        , title: '宸ュ簭娲惧伐鍗�-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType=3772'
                     })
@@ -1027,7 +1027,7 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠g爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠g爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠g爜", "宸ヨ壓璺嚎", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠g爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠g爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠g爜", "宸ヨ壓璺嚎", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�","鍞竴ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
@@ -1042,6 +1042,27 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 160;
+                                            break;
+                                        case '浜у搧浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 200;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserWorkCenter.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserWorkCenter.html"
new file mode 100644
index 0000000..12cdb72
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserWorkCenter.html"
@@ -0,0 +1,433 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鐢ㄦ埛鍏宠仈宸ヤ綔涓績</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/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>
+    <style type="text/css">
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            float: left;
+            display: block;
+            padding: 9px 15px;
+            width: 31px;
+            font-weight: 400;
+            line-height: 20px;
+            text-align: left;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢ㄦ埛</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <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>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+    //鑾峰彇鍙傛暟
+    var params = get_UrlVars();
+    if (typeof (params[params[0]]) == "undefined") {
+        var OperationType = 1;//鎿嶄綔绫诲瀷
+        var closeType = 2;  //鍏抽棴绫诲瀷
+    } else {
+        var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+        var linterid = params[params[1]];//婧愬崟id
+        var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+    }
+
+    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 = [];
+        TabRow = { "HItemID": 0, "HNumber": "", "HName": "" };
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+        //鍒濆鍖栬〃鏍�
+        set_InitGrid();
+
+        //鍒ゆ柇鎿嶄綔绫诲瀷
+        if (OperationType == 1) {//鏃犳簮鏂板
+            //鏃犳簮鏂板
+            set_AddFNew();
+        }
+        else if (OperationType == 3) {//缂栬緫
+            //set_EditFromGrid(linterid);
+        }
+        else {
+            layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+        }
+        //#endregion
+
+        //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+        //澶村伐鍏锋爮
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;;
+            var AddRow = table.cache['mainTable'];
+            var NewRow = TabRow;
+            switch (obj.event) {
+                //鏂板涓�琛�
+                case 'btn-AddLine': btnAddLine(NewRow);
+                    break;
+                //澶嶅埗涓�琛�
+                case 'btn-CopyLine': btnCopyLine(data);
+                    break;
+            }
+        });
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        });
+        //鐢ㄦ埛淇℃伅寮圭獥
+        form.on('submit(UserList)', function () {
+            //椤甸潰灞�-鑷畾涔�
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '鐢ㄦ埛鍒楄〃',
+                closeBtn: 1,
+                shift: 2,
+                area: ['80%', '80%'],
+                maxmin: true,
+                content: ['../../PublicPage/PeopleInformation.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('璇烽�夋嫨鏁版嵁');
+                    }
+                    $("#UserName").val(checkStatus.data[0].HName);
+                    $("#UserID").val(checkStatus.data[0].HNumber);
+
+                    $.ajax({
+                        url: GetWEBURL() + "/Xt_User/UserWorkCenterlistPlaylist",
+                        type: "GET",
+                        data: { "HUserID": checkStatus.data[0].HNumber },
+                        success: function (data) {
+                            if (data.data != null && data.data != "") {
+                                option.data = data.data;
+                                table.render(option);
+                            }
+                            else {
+                                table.reload("mainTable", {});
+                                table.reload('mainTable', { data: [] });
+                            }
+                        }
+                    });
+                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+            });
+        });
+
+        //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                if (event.key == "F7") {
+                    //宸ヤ綔涓績
+                    if (obj.event === 'HNumber') {
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '宸ヤ綔涓績鍒楄〃',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['80%', '80%'],
+                            maxmin: true,
+                            content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+                                }
+                                //console.log(obj.data);
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                obj.update({
+                                    HItemID: checkStatus.data[0].HItemID,
+                                    HNumber: checkStatus.data[0].宸ヤ綔涓績浠g爜,
+                                    HName: checkStatus.data[0].宸ヤ綔涓績
+                                });
+
+                                layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                            }
+                            , btn2: function (index, layero) {
+                                //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                            },
+                            end: function () {
+
+                            }
+                        });
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+        }
+
+        //淇濆瓨
+        form.on('submit(Saver)', function (data) {
+            if ($("#UserName").val() == "") {
+                layer.msg("鐢ㄦ埛涓嶈兘涓虹┖锛�");
+                return false;
+            }
+            var UserID = $("#UserID").val();  //鑾峰彇閫夋嫨鐨勭敤鎴风紪鐮�
+            //debugger;
+            var sSubStr = JSON.stringify(table.cache['mainTable']);
+            if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+            {
+                return false;
+            }
+            var list = [];
+            for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
+                list.push(JSON.parse(sSubStr)[i].HNumber)
+            }
+            if (isAllEqual(list)) {
+                layer.msg("鏈夐噸澶嶇殑宸ヤ綔涓績淇℃伅锛�");
+                return false;
+            }
+
+            var sMainSub = sSubStr + ';' + UserID
+            $.ajax(
+                {
+                    type: "POST",
+                    url: GetWEBURL() + "/Xt_User/SaveUserWorkCenter", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+
+                            layer.alert(data.Message);
+                            console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+
+                        layer.alert("閿欒:" + err);
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+        });
+
+        //閫�鍑�
+        form.on('submit(Exit)', function (data) {
+            if (OperationType == 1) {
+                Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+            }
+            else if (OperationType == 3) {
+                Pub_Close(closeType);
+            }
+            else {
+                Pub_Close(2);
+            }
+        });
+
+        //鏂板鎸夐挳
+        form.on('submit(set_AddNew)', function () {//鎻愪氦
+            layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                location.replace('Gy_UserWorkCenter.html?OperationType=1&linterid=0&HSouceBillType=&closeType=2');
+            });
+        })
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夋柟娉�
+        //鍒濆鍖栬〃鏍�
+        function set_InitGrid() {
+            columns = [
+                { type: 'checkbox', fixed: 'left' }
+                , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left' }
+                , { field: 'HItemID', title: 'HItemID', edit: 'text', hide: true }
+                , { field: 'HNumber', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: 'HNumber' }
+                , { field: 'HName', title: '宸ヤ綔涓績鍚嶇О' }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+            ];
+            option = {
+                id: 'mainTable'
+                , elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , page: false
+                , cellMinWidth: 120
+                , height: 680
+                , cols: [columns]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                , done: function (res, curr, count) {
+                }
+            };
+        }
+        //鏃犳簮鍗曟柊澧�
+        function set_AddFNew() {
+            option.data = [TabRow];
+            table.render(option);
+        }
+
+        //澧炲姞涓�琛�
+        function btnAddLine(NewRow) {
+            var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+
+            buttonArr = [];//娓呯┖鏁扮粍
+            for (var i = 0; i < tableBak.length; i++) {
+                buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+            }
+            buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+            table.reload("mainTable", {
+                data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+            })
+        }
+        //澶嶅埗涓�琛�
+        function btnCopyLine(data) {
+            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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+            }
+        }
+        // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                    var oldData = table.cache["mainTable"];
+                    oldData.splice(obj.tr.data('index'), 1);
+                    table.reload('mainTable', { data: oldData });
+                    layer.close(index);
+                });
+            }
+        }
+        //#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+        function isAllEqual(list) {
+            var s = list.join(",") + ",";
+            for (var i = 0; i < list.length; i++) {
+                if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
+                    return true;
+                }
+            }
+        }
+        //#region 闈炵┖楠岃瘉
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            var Result = true;
+            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                layer.msg("娌℃湁宸ヤ綔涓績鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].閮ㄩ棬浠g爜 == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ綔涓績浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
+            }
+            else {
+                return Result = true;
+            }
+            return Result;
+        }
+
+    });
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index a9bdc2e..08aeefb 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -59,10 +59,10 @@
 
                         <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>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -73,7 +73,7 @@
                             <!--鍩烘湰淇℃伅-->
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�*</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -121,7 +121,7 @@
                                         </div>
 
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁¢噺鍗曚綅*</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -232,7 +232,7 @@
 
 
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
                                             <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
@@ -514,12 +514,13 @@
                     , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "CheckHCenterID" }//涓嶅~
                     // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
                     , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
-                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+                    , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text', }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     // , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
-                    , { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID", hide: true }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', hide: true }//f7
+                    , { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag", hide: true }//checkbox
 
                     //, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
                     ////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
@@ -553,8 +554,7 @@
                     //, { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
                     //, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
                     //, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
-                    //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
-                    //, { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+                    //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿                  
                     //, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
                     //, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
                     //, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
@@ -587,6 +587,9 @@
                 //    });
                 //}
             }
+
+            //鍒ゆ柇鏄惁鏈変慨鏀瑰伐浠锋潈闄�
+            EditProcPrice();
 
             //鍒濆鍔犺浇琛ㄦ牸
             option.data = rowdata;
@@ -630,7 +633,7 @@
                     }
                 });
             }
-            else if (OperationType == 2) {
+            else if (OperationType == 2) { //澶嶅埗
                 //绂佺敤缁勭粐閫夐」
                 //$("#HOrgID").attr("disabled", true);
                 RoadBillMain(linterid);
@@ -1123,6 +1126,29 @@
 
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
+            //鍒ゆ柇鏄惁鑳戒慨鏀瑰伐浠�
+            function EditProcPrice() {
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/EditProcPrice",
+                    async: false,
+                    data: { "UserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                        } else {
+                            //鏃犳潈闄�
+                            for (let i = 0; i < option.cols[0].length; i++) {
+                                if (option.cols[0][i].field == 'HProcPrice') {
+                                    option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+                                }
+                            }
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
             //鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
@@ -1168,9 +1194,30 @@
                         $("#HMaterModel").val(checkStatus.data[0].HModel);//瑙勬牸鍨嬪彿
                         $("#HUnitID").val(checkStatus.data[0].HUnitID);//璁¢噺鍗曚綅id
                         $("#HUnitName").val(checkStatus.data[0].HUnitName);//璁¢噺鍗曚綅鍚嶇О
-                        if ($("#HName").val() == "") {
-                            $("#HName").val(checkStatus.data[0].HNumber + '/' + checkStatus.data[0].HName + '/' + checkStatus.data[0].HModel);
-                        }
+
+                        $("#HName").val(checkStatus.data[0].HNumber + '/' + checkStatus.data[0].HName + '/' + checkStatus.data[0].HModel);   
+
+                        var ajaxLoad = layer.load();
+                        $.ajax({
+                            //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                            url: GetWEBURL() + '/LEMS/IsExistRoutingByMaterial',
+                            type: "GET",
+                            data: { "HMaterID": checkStatus.data[0].HItemID, "user": sessionStorage["HUserName"] },
+                            success: function (data1) {
+                                if (data1.data.length >= 1) {
+                                   
+                                    layer.close(ajaxLoad);
+                                   
+                                    layer.alert("褰撳墠鐗╂枡宸插瓨鏈夊伐鑹鸿矾绾�", { icon: 3 });
+                                } else {
+                                    layer.close(ajaxLoad);
+                                    //layer.alert(data1.code + data1.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.close(ajaxLoad);
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1514,101 +1561,101 @@
                                         return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                                     }
 
-                                    //鑾峰彇宸ュ簭浠g爜
-                                    var ProcessNumber = [];
-                                    for (var i = 0; i < checkStatus.data.length; i++) {
-                                        ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠g爜"] + "'");
-                                    }
+                                    ////鑾峰彇宸ュ簭浠g爜
+                                    //var ProcessNumber = [];
+                                    //for (var i = 0; i < checkStatus.data.length; i++) {
+                                    //    ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠g爜"] + "'");
+                                    //}
 
-                                    //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
-                                    var NowNum = 0;
-                                    for (var i = 0; i < option.data.length; i++) {
-                                        if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
-                                            NowNum = i + 1;
-                                        }
-                                    }
+                                    ////鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                                    //var NowNum = 0;
+                                    //for (var i = 0; i < option.data.length; i++) {
+                                    //    if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+                                    //        NowNum = i + 1;
+                                    //    }
+                                    //}
                                  
-                                    //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
-                                    var WorkCente = [];
-                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
-                                    $.ajax({
-                                        type: "GET",
-                                        url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                        async: false,
-                                        data: { "sWhere": sWhere },
-                                        success: function (data) {
-                                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                                WorkCente = data.data;
-                                            }
-                                            else {
-                                                layer.msg(data.Message, { icon: 5 });
-                                            }
-                                            layer.closeAll("loading");
-                                        },
-                                        error: function (err) {
-                                            layer.msg("閿欒:" + err, { icon: 5 });
-                                        }
-                                    });
+                                    ////鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+                                    //var WorkCente = [];
+                                    //var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+                                    //$.ajax({
+                                    //    type: "GET",
+                                    //    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    //    async: false,
+                                    //    data: { "sWhere": sWhere },
+                                    //    success: function (data) {
+                                    //        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    //            WorkCente = data.data;
+                                    //        }
+                                    //        else {
+                                    //            layer.msg(data.Message, { icon: 5 });
+                                    //        }
+                                    //        layer.closeAll("loading");
+                                    //    },
+                                    //    error: function (err) {
+                                    //        layer.msg("閿欒:" + err, { icon: 5 });
+                                    //    }
+                                    //});
 
-                                    //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
-                                    if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
-                                        //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
-                                        var num = ProcessNumber.length - option.data.length + (NowNum - 1);
-                                        //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
-                                        var j = 0;
-                                        for (var i = (NowNum - 1); i < option.data.length; i++) {
-                                            option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
-                                            option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
-                                            option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
-                                            option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
-                                            option.data[i]["宸ヤ綔涓績浠g爜"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
-                                            j++;
-                                        }
+                                    ////鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+                                    //if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+                                    //    //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+                                    //    var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+                                    //    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    //    var j = 0;
+                                    //    for (var i = (NowNum - 1); i < option.data.length; i++) {
+                                    //        option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                    //        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                    //        option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                    //        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                    //        option.data[i]["宸ヤ綔涓績浠g爜"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                    //        j++;
+                                    //    }
 
-                                        //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
-                                        for (var i = 0; i < num; i++) {
-                                            option.data.push({
-                                                "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
-                                                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
-                                                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
-                                                , "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠g爜": WorkCente[j]["宸ヤ綔涓績浠g爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
-                                                , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
-                                                , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
-                                                , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
-                                                , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
-                                                , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
-                                                , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
-                                                , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
-                                                , "HWHID": 0, "HWHName": "", "HRemark": ""
-                                            })
-                                            j++;
-                                        }
-                                    } else {
-                                        //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
-                                        var j = 0;
-                                        for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
-                                            option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
-                                            option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
-                                            option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
-                                            option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
-                                            option.data[i]["宸ヤ綔涓績浠g爜"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
-                                            j++;
-                                        }
-                                    }
-                                    table.render(option);
+                                    //    //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+                                    //    for (var i = 0; i < num; i++) {
+                                    //        option.data.push({
+                                    //            "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+                                    //            , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
+                                    //            , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": WorkCente[j]["宸ュ簭鍚嶇О"]
+                                    //            , "HProcID": WorkCente[j]["HProcID"], "宸ヤ綔涓績浠g爜": WorkCente[j]["宸ヤ綔涓績浠g爜"], "HCenterID": WorkCente[j]["HCenterID"], "宸ヤ綔涓績": WorkCente[j]["宸ヤ綔涓績鍚嶇О"], "HSupID": 0
+                                    //            , "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
+                                    //            , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
+                                    //            , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
+                                    //            , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
+                                    //            , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
+                                    //            , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+                                    //            , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
+                                    //            , "HWHID": 0, "HWHName": "", "HRemark": ""
+                                    //        })
+                                    //        j++;
+                                    //    }
+                                    //} else {
+                                    //    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    //    var j = 0;
+                                    //    for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+                                    //        option.data[i]["宸ュ簭"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                    //        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                    //        option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                    //        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                    //        option.data[i]["宸ヤ綔涓績浠g爜"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                    //        j++;
+                                    //    }
+                                    //}
+                                    //table.render(option);
                                     //var HCenterID = 0;
                                     //var HCenterNUmber = "";
                                     //var HCenterName = "";
                                    
 
-                                    ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    //obj.update({
-                                    //    "宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
-                                    //    , "HProcID": checkStatus.data[0].HItemID
-                                    //    , "宸ヤ綔涓績": HCenterName
-                                    //    , "HCenterID": HCenterID
-                                    //    , "宸ヤ綔涓績浠g爜": HCenterNUmber
-                                    //})
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "宸ュ簭": checkStatus.data[0].宸ュ簭鍚嶇О
+                                        , "HProcID": checkStatus.data[0].HItemID
+                                        //, "宸ヤ綔涓績": HCenterName
+                                        //, "HCenterID": HCenterID
+                                        //, "宸ヤ綔涓績浠g爜": HCenterNUmber
+                                    })
 
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -2141,7 +2188,7 @@
                     success: function (data1) {
                         if (data1.data.length != 0) {
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷","渚涘簲鍟嗕唬鐮�","渚涘簲鍟�","澶栧崗鏍囪"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fdb8bff..ec0ebf8 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -22,9 +22,17 @@
                     <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 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="HModel" id="HModel">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 107px;">
+                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -33,7 +41,48 @@
                                         <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">杩囨护</label>
+                                        <div class="layui-input-block">
+                                            <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+                                    </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>
+                                <div class="layui-inline" style="display:none">
+                                    <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>                               
+                                <div class="layui-inline" style="display:none">
                                     <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠g爜</label>
                                     <div class="layui-input-block" style="margin-left: 77px;">
                                         <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -41,62 +90,6 @@
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                         </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; width: 185px;">
-                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
-                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                        </select>
-                                    </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-colla-content" style="padding: 0px; margin-left: 6%;">
-                                    <div class="layui-row" style="margin-top:10px;">
-                                        <!--鍏朵粬鏉′欢-->
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
-                                            <div class="layui-input-block" style="margin-left: 107px;">
-                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
-                                            </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="HModel" id="HModel">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
-                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -256,21 +249,22 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
-                        , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
-                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
                         , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
                         , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
                         , { field: '宸ュ簭', title: '宸ュ簭' }
+                        , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
                         , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
                         , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+                        , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
                         , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
                         , { field: '淇敼浜�', title: '淇敼浜�' }
@@ -300,8 +294,7 @@
                         ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                         ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                         ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
-                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
-                        //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
+                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }                       
                         ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                         //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
                         //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
@@ -367,6 +360,28 @@
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
+
+                            //鍒ゆ柇鏄惁鏈夋煡鐪嬪伐浠锋潈闄�
+                            $.ajax({
+                                type: "get",
+                                url: GetWEBURL() + "/Web/CheckProcPrice",
+                                async: false,
+                                data: { "UserName": sessionStorage["HUserName"] },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                       
+                                    } else {
+                                        //鏃犳潈闄�
+                                        for (let i = 0; i < option.cols[0].length; i++) {
+                                            if (option.cols[0][i].field == '鍔犲伐鍗曚环') {
+                                                option.cols[0][i].hide = true; //闅愯棌宸ヤ环瀛楁
+                                            }
+                                        }
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            })
+
                             table.render(option);
                             layer.close(ajaxLoad);
 
@@ -627,6 +642,32 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 180;
+                                            break;    
+                                        case '宸ュ簭鍙�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '宸ュ簭':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鍔犲伐鍗曚环':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '宸ヤ綔涓績鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 170;
+                                            break;
+                                        case '鍒跺崟鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 197;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 135;
+                                            break;
+                                        case '宸ヨ壓鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 345;
+                                            break;
+                                    }             
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillMainRates.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillMainRates.html"
index 230a54a..accd78b 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillMainRates.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillMainRates.html"
@@ -221,79 +221,12 @@
 
 
             //#region 鍒濆鍖栫晫闈�
-            function set_ClearBill() {
-                //鍒濆鍖栬〃鏍�
-                set_InitGrid();
+            function set_ClearBill() {               
                 Organ();
                 //鏌ヨ
                 get_FastQuery(1);
             }
-            //#endregion
-
-            function set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left' }
-                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
-                        , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
-                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                        , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
-                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                        , { field: '宸ュ簭', title: '宸ュ簭' }
-                        , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
-                        , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
-                        , { field: '淇敼浜�', title: '淇敼浜�' }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
-                        , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
-                        //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
-                        ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
-                        //, { field: '缁勭粐', title: '缁勭粐' }
-                        ////, { field: 'hsubid', title: 'hsubid', width: 80 }
-                        //, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
-                        ////, { field: 'hprocid', title: 'hprocid', width: 105 }
-                        ////, { field: 'HSupID', title: 'HSupID', width: 105 }
-                        //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                        //, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                        ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
-                        //, { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
-                        //, { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
-                        //, { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
-                        //, { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
-                        //, { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
-                        //, { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
-                        //, { field: '鑹巼', title: '鑹巼' }
-                        //, { field: '绱鑹巼', title: '绱鑹巼' }
-                        //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
-                        //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                        //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                        ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
-                        ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
-                        ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
-                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
-                        //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
-                        ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
-                        //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
-                        //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
-                    ]]
-                };
-            }
+            //#endregion            
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
@@ -312,7 +245,6 @@
                 sWhere = "";
             }
             //#endregion
-
 
             //鐗╂枡
             function get_btnHMaterID() {
@@ -414,8 +346,6 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(number) {
-                var HOrgID = "";
-                var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
                 //var HMaterID = $("#HMaterID").val();
                 var HMaterName = $("#HMaterName").val();
                 var HMaterNumber = $("#HMaterNumber").val();
@@ -447,17 +377,6 @@
                     sWhere += " and " + ColName + " " + com;
                 }
 
-
-                //if (number == 1) {
-                //    HOrgID = sessionStorage["OrganizationID"];
-                //}
-                //else {
-                //    HOrgID = $("#HOrgID").val();//缁勭粐
-                //}
-
-                //if (HOrderProcNO) {
-                //    sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
-                //}
                 if (HMaterName) {
                     sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
                 }
@@ -470,9 +389,6 @@
                 if (WorkCenter) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
                 }
-                //if (HOrgID) {
-                //    sWhere += " and HOrgID = '" + HOrgID + "'";
-                //}
                 sWhere += " and 宸ュ簭浠g爜 != '9999'"
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -499,7 +415,7 @@
                         , area: ['100%', '100%']
                         , title: '宸ヨ壓璺嚎-缁存姢宸ヤ环'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=5&linterid=0&HMaterID=' + HMaterID + '&HNumber=' + escape(HNumber) + '&HName=' + escape(HName) + '&HModel=' + HModel + '&HProcId=' + HProcId + '&HProcNumber=' + HProcNumber + '&HProcName=' + HProcName
+                        , content: encodeURI('../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=2&linterid=0&HMaterID=' + HMaterID + '&HNumber=' + HNumber + '&HName=' + HName + '&HModel=' + HModel + '&HProcId=' + HProcId + '&HProcNumber=' + HProcNumber + '&HProcName=' + HProcName)
                         , end: function () {
                             //鍒锋柊椤甸潰,
                             location.reload();
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 7f8516d..bd231ec 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"
@@ -38,19 +38,19 @@
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>姹囨姤</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-RK" lay-filter="btn-RK" id="btn-RK"></i>鍏ュ簱</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-BF" lay-filter="btn-BF" id="btn-BF"></i>鎶ュ簾</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_HideColumn" id="set_HideColumn">鍒楄缃�</button>
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>姹囨姤</button>
+            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-RK" lay-filter="btn-RK" id="btn-RK"></i>鍏ュ簱</button>
+            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-BF" lay-filter="btn-BF" id="btn-BF"></i>鎶ュ簾</button>-->
+                            <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_HideColumn" id="set_HideColumn">鍒楄缃�</button>-->
                         </div>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
                             <div class="layui-col-xs4 layui-inline">
-                                <h2>宸ュ簭鍑虹珯姹囨姤鍗�</h2>
+                                <h2>宸ュ簭姹囨姤鍗�</h2>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
@@ -71,48 +71,6 @@
                             <!--鍩烘湰淇℃伅-->
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>                                       
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <!--<div class="layui-col-xs4 layui-inline">
-                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                            </div>
-                        </div>-->
-                                    </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label"><span style="color:red;">*</span>浜у搧浠g爜</label>
@@ -139,26 +97,124 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏈眹鎶ユ暟閲�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;background-color:#efefef4d;" id="NoOutboundHqty" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty" onfocus="this.select();">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" onfocus="this.select();">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娲惧伐鍗曟暟閲�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娲惧伐鍗曞彿</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
                                             </div>
                                         </div>
+                                    </div>
+
+                                    <div class="layui-row">
+
                                         <!--<div class="layui-col-xs4 layui-inline">
-        <label class="layui-form-label">褰撳墠宸ュ簭</label>
-        <div class="layui-input-inline">
-            <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-            <input type="hidden" name="HProcID" id="HProcID" value="0">
-            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
-                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-            </button>
-        </div>
-    </div>-->
+                            <label class="layui-form-label">宸ユ椂</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+                            </div>
+                        </div>
+                        <div class="layui-col-xs4 layui-inline">
+                            <label class="layui-form-label">璁惧娓呭崟</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" value="0" name="" id="">
+                            </div>
+                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs8 layui-inline">
+                            <label class="layui-form-label">澶囨敞</label>
+                            <div class="layui-input-block">
+                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                            </div>
+                        </div>-->
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鏈嚭绔欐暟閲�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -168,6 +224,12 @@
                                                 <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                             </div>
                                         </div>
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                            </div>
+                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -194,29 +256,14 @@
                                                 <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
+                                            <label class="layui-form-label">妫�楠屽憳</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px; padding: 0 10px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
-                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
                                             </div>
                                         </div>
                                     </div>
@@ -252,51 +299,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">妫�楠屽憳</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
-                                            </div>
-                                        </div>
-                                        <!--<div class="layui-col-xs4 layui-inline">
-                            <label class="layui-form-label">宸ユ椂</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
-                            </div>
-                        </div>
-                        <div class="layui-col-xs4 layui-inline">
-                            <label class="layui-form-label">璁惧娓呭崟</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
-                            </div>
-                        </div>-->
-                                    </div>
-                                    <div class="layui-row">
-                                        <!--<div class="layui-col-xs4 layui-inline">
-                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" value="0" name="" id="">
-                            </div>
-                        </div>-->
-                                    </div>
-                                    <div class="layui-row">
-                                        <!--<div class="layui-col-xs8 layui-inline">
-                            <label class="layui-form-label">澶囨敞</label>
-                            <div class="layui-input-block">
-                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
-                            </div>
-                        </div>-->
-                                    </div>
-                                </div>
-                            </div>
-                            <!--鍏朵粬淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鑱屽憳2</label>
@@ -351,7 +353,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鍑虹珯鏃堕棿</label>
+                                            <label class="layui-form-label">姹囨姤鏃堕棿</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
                                             </div>
@@ -404,16 +406,6 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
                                                 </button>
                                                 <input type="hidden" value="0" name="HSourceID5" id="HSourceID5">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -554,7 +546,7 @@
                     <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
                     <div class="layui-tab layui-tab-card">
                         <ul class="layui-tab-title">
-                            <li class="layui-this">娴佽浆鍗�</li>
+                            <li class="layui-this">娲惧伐鍗�</li>
                             <li>宸ヨ壓鍙傛暟娓呭崟</li>
                         </ul>
                         <div class="layui-tab-content">
@@ -578,6 +570,11 @@
                     <input type="hidden" name="HDSQty" id="HDSQty" value="0"><!--鎶樺集鍒�鏁�-->
                     <input type="hidden" name="HChongQty" id="HChongQty" value="0"><!--NCT鍐叉鏁�-->
                     <input type="hidden" name="HPriceRate" id="HPriceRate" value="0"><!--绯绘暟-->
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
                 </form>
             </div>
         </div>
@@ -600,6 +597,7 @@
             $("#HBarCode").focus();
             var option;
             var HModName = "Cj_StationOutBill";
+            var titleData = ["娴佽浆鍗″彿", "璁㈠崟璺熻釜鍙�", "鐢熶骇璁㈠崟鍙�", "浜у搧浠g爜", "浜у搧鍚嶇О", "娴佽浆鍗℃暟閲�", "鏄惁濮斿", "渚涘簲鍟�", "杩涚珯鏁伴噺"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var FirstEndHProcNo = 0; // 榛樿0  棣栭亾宸ュ簭1 鏈亾宸ュ簭2
 
           
@@ -653,6 +651,14 @@
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
             var titleData2 = ["HItemID"]  //闅愯棌鍒楋紙宸ヨ壓鍙傛暟娓呭崟锛�
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'get_HideColumn': get_HideColumn();
+                        break;
+                };
+            });
 
             function set_InitGrid() {
                 //琛ㄥご
@@ -864,9 +870,12 @@
             });
 
             function txtHBarCode_KeyDown(HBarCode) {
+                //鎵爜绫诲瀷1
                 var barNo = HBarCode.substr(0, 3);
+                //鎵爜绫诲瀷2
+                var barNo2 = HBarCode.substr(0, 4);
                 if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
-                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.msg("璇锋壂瀹屾淳宸ュ崟鍚庡啀鎵伐搴忕爜")
                     layer.close(index);
                     return;
                 }
@@ -879,6 +888,125 @@
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
+
+                            switch (barNo2) {
+                                case "GXLZ":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrgID": data.缁勭粐,
+                                        "HPRDOrg": data.缁勭粐鍚嶇О,
+                                        "lngBillSubKey": data.hsubid,
+                                        "HProcName": data.宸ュ簭,
+                                        "HProcID": data.HProcID,
+                                        "HProcNo": data.娴佹按鍙�,
+                                        "HCenterName": data.宸ヤ綔涓績,
+                                        "HCenterID": data.HCenterID,
+                                        "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                    });
+                                    $("#HProcNo").attr('disabled', 'disabled');
+                                    HProcExchBillNoFlag = true;
+                                    break;
+                                case "GXLX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrgID": data.缁勭粐,
+                                        "HPRDOrg": data.缁勭粐鍚嶇О,
+                                        "HCenterName": data.宸ヤ綔涓績,
+                                        "HCenterID": data.HCenterID,
+                                        "lngBillSubKey": data.hsubid,
+                                        "HProcName": data.宸ュ簭,
+                                        "HProcID": data.HProcID,
+                                        "HProcNo": data.宸ュ簭鍙�,
+                                        "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                    });
+                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    //$("#HBarCode").css("background-color", "#efefef4d");
+                                    $("#HProcNo").attr('disabled', 'disabled');
+                                    HProcExchBillNoFlag = true;
+
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID,
+                                                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                                });
+
+                                                if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 1;
+                                                } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 2;
+                                                }
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
+                                            }
+                                        }
+                                    })
+
+                                    option = {
+                                        elem: '#mainTable',
+                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                        //, cellMinWidth: 80
+                                        toolbar: '#toolbarDemo'
+                                        , where: { HProcExchHinteID: HProcExchHinteID }
+                                        , cols: [[
+                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
+                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜',width:150 }
+                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О',width:200 }
+                                            , { field: '娴佽浆鍗℃暟閲�', title: '娲惧伐鍗曟暟閲�',width:103 }
+                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�',width:50 }
+                                            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О',width:135 }
+                                            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺',width:90 }
+                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績',width:145 }
+                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', hide: true }
+                                            , { field: 'hbillno', title: '娲惧伐鍗曞彿', hide: true }
+                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true }
+                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', hide: true }
+                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', hide: true }
+                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺', hide: true }
+                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', hide: true }
+                                        ]]
+                                        , height: 500
+                                    }
+                                    table.render(option)
+                                    break;
+                            }
             
                             switch (barNo) {
                                 case "HCX":
@@ -939,89 +1067,91 @@
                                         "HMaterModel": data.瑙勬牸鍨嬪彿
                                     });
                                     break;
-                                case "GXL":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HICMOInterID": data.hicmointerid,
-                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                        "HMaterID": data.HMaterID,
-                                        "HMaterName": data.浜у搧,
-                                        "HMaterNumber": data.浜у搧浠g爜,
-                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
-                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
-                                        "lngBillKey": data.hmainid,
-                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                        "HProcExchHinteID": data.hmainid,
-                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                        "HPRDOrgID": data.缁勭粐
-                                    });
-                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                    //$("#HBarCode").css("background-color", "#efefef4d");
-                                    HProcExchBillNoFlag = true;
+                                //case "GXL":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HICMOInterID": data.hicmointerid,
+                                //        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                //        "HMaterID": data.HMaterID,
+                                //        "HMaterName": data.浜у搧,
+                                //        "HMaterNumber": data.浜у搧浠g爜,
+                                //        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                //        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                //        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                //        "lngBillKey": data.hmainid,
+                                //        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                //        "HProcExchHinteID": data.hmainid,
+                                //        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                //        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                //        "HPRDOrgID": data.缁勭粐
+                                //    });
+                                //    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                //    //$("#HBarCode").css("background-color", "#efefef4d");
+                                //    HProcExchBillNoFlag = true;
 
-                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
-                                    var HInterID = data.hmainid;
-                                    //鑷姩鍖归厤娴佹按鍙�
-                                    $.ajax({
-                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
-                                        type: "GET",
-                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
-                                        success: function (data1) {
-                                            if (data1.count == 1) {
-                                                var data = data1.data[0];
-                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                                    "lngBillSubKey": data.hsubid,
-                                                    "HProcName": data.宸ュ簭,
-                                                    "HProcID": data.宸ュ簭ID,
-                                                    "HProcNo": data.娴佹按鍙�,
-                                                    "HCenterName": data.宸ヤ綔涓績,
-                                                    "HCenterID": data.HCenterID,
-                                                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
-                                                });
+                                //    var HProcExchHinteID = $('#HProcExchHinteID').val();
+                                //    var HInterID = data.hmainid;
+                                //    //鑷姩鍖归厤娴佹按鍙�
+                                //    $.ajax({
+                                //        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                //        type: "GET",
+                                //        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+                                //        success: function (data1) {
+                                //            if (data1.count == 1) {
+                                //                var data = data1.data[0];
+                                //                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //                    "lngBillSubKey": data.hsubid,
+                                //                    "HProcName": data.宸ュ簭,
+                                //                    "HProcID": data.宸ュ簭ID,
+                                //                    "HProcNo": data.娴佹按鍙�,
+                                //                    "HCenterName": data.宸ヤ綔涓績,
+                                //                    "HCenterID": data.HCenterID,
+                                //                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                //                });
 
-                                                if (data.棣栭亾宸ュ簭 == "鏄�") {
-                                                    FirstEndHProcNo = 1;
-                                                } else if (data.鏈亾宸ュ簭 == "鏄�") {
-                                                    FirstEndHProcNo = 2;
-                                                }
-                                                $("#HProcNo").attr("readonly", "readonly");
-                                                $("#HProcNo").css("background-color", "#efefef4d");
-                                            }
-                                        }
-                                    })
+                                //                if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                //                    FirstEndHProcNo = 1;
+                                //                } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                //                    FirstEndHProcNo = 2;
+                                //                }
+                                //                $("#HProcNo").attr("readonly", "readonly");
+                                //                $("#HProcNo").css("background-color", "#efefef4d");
+                                //            }
+                                //        }
+                                //    })
 
-                                    option = {
-                                        elem: '#mainTable',
-                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                        //, cellMinWidth: 80
-                                        toolbar: '#toolbarDemo'
-                                        , where: { HProcExchHinteID: HProcExchHinteID }
-                                        , cols: [[
-                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
-                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
-                                            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
-                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
-                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
-                                            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
-                                            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
-                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
-                                            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
-                                        ]]
-                                        , height: 500
-                                    }
-                                    table.render(option)
-                                    break;
+                                //    option = {
+                                //        elem: '#mainTable',
+                                //        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                //        //, cellMinWidth: 80
+                                //        toolbar: '#toolbarDemo'
+                                //        , where: { HProcExchHinteID: HProcExchHinteID }
+                                //        , cols: [[
+                                //            { type: 'numbers', title: '搴忓彿', totalRow: true }
+                                //            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text', hide: true }
+                                //            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+                                //            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text', hide: true }
+                                //            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', hide: true }
+                                //            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text', hide: true }
+                                //            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', hide: true }
+                                //            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                                //            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                                //            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                                //            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text', hide: true }
+                                //            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', hide: true }
+                                //            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                                //            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text', hide: true }
+                                //            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺',width:237 }
+                                //        ]]
+                                //        , height: 500
+                                //    }
+                                //    table.render(option)
+                                //    break;
                             }
                             //layer.close(index);
                             //set_InitGrid();
                             //table.render(option);
+
+                            $("#HBarCode").val("");
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -1073,7 +1203,7 @@
                             //鍔ㄦ�佹樉绀哄垪鍚�
                             table.render({
                                 elem: '#mainTable2'
-                                , toolbar: '#toolbarDemo'
+                                , toolbar: '#toolbarDemo2'
                                 , cols: [col]
                                 , data: data1.data
                                 , height: 550
@@ -1103,7 +1233,7 @@
                 var sBillNo = $('#HBarCode').val();
                 if (event.keyCode == 13) {
                     if (!HProcExchBillNoFlag) {
-                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        layer.msg("娲惧伐鍗曟病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔淳宸ュ崟鎴栬�呭湪娲惧伐鍗曟枃鏈涓寜鍥炶溅閿紒");
                         return;
                     }
                     txtHProcNo_KeyDown(sBillNo, sProcNo);
@@ -1345,13 +1475,14 @@
                                     }
                                 }
                             }
-                            if (data.Verify == "Y") {
-                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
-                            }
-                            else {
-                                //淇濆瓨鍚庢祻瑙�
-                                ReRoadBillMain();
-                            }
+                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                            //if (data.Verify == "Y") {
+                            //    location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                            //}
+                            //else {
+                            //    //淇濆瓨鍚庢祻瑙�
+                            //    ReRoadBillMain();
+                            //}
                         }
                         else {
                             layer.close(index);
@@ -1381,10 +1512,10 @@
             });
 
             //鍒楄缃�
-            form.on('submit(set_HideColumn)', function () {
-                //璋冪敤闅愯棌鍒楄缃柟娉�
-                get_HideColumn()
-            });
+            //form.on('submit(set_HideColumn)', function () {
+            //    //璋冪敤闅愯棌鍒楄缃柟娉�
+            //    get_HideColumn()
+            //});
 
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
@@ -1883,23 +2014,14 @@
 
             }
 
-            //闅愯棌鍒楄缃�
+             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
-                var contentUrl = "";
-                                
                 for (var i = 1; i < option.cols[0].length - 1; 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" //鍔犱笂杈规
@@ -1908,7 +2030,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1917,7 +2039,7 @@
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                 })
-            }
+            }           
 
             //鏄剧ず鍒楁暟鎹�
             function DisPlay_HideColumn() {
@@ -1928,8 +2050,7 @@
                     success: function (data1) {
                         if (data1.data.length != 0) {
 
-                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["娴佽浆鍗″彿"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁                           
 
                             dataCol = data1.data[0].HGridString.split(',');
 
@@ -1941,7 +2062,31 @@
                                 }
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
+                                    //dataCols[3] = 237;
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '浜у搧浠g爜':
+                                            option.cols[0][i + 1]["width"] = 200;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 200;
+                                            break;
+                                        case '娴佽浆鍗℃暟閲�':
+                                            option.cols[0][i + 1]["width"] = 103;
+                                            break;
+                                        case '娴佹按鍙�':
+                                            option.cols[0][i + 1]["width"] = 75;
+                                            break;
+                                        case '宸ュ簭鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 135;
+                                            break;
+                                        case '鍑虹珯鏁伴噺':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '宸ヤ綔涓績':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
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_StationOutBillList.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_StationOutBillList.html"
index 9ebe8fe..92e45f7 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_StationOutBillList.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_StationOutBillList.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</title>
+    <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">
@@ -29,6 +29,14 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block">
+                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+                                        </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" name="HEmpNumber" id="HEmpNumber">
@@ -40,7 +48,7 @@
                                         <input type="text" class="layui-input" name="HEmpName" id="HEmpName">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none">
                                     <label class="layui-form-label">鐘舵��</label>
                                     <div class="layui-input-block">
                                         <select name="HStatus" lay-filter="HStatus" style="width:190px;">
@@ -151,9 +159,9 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
@@ -190,10 +198,11 @@
             var option = [];
 
             var HModName = "Cj_StationOutBillList";
-            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID","閫夋嫨","鏌ヨ鏃ユ湡","鎴愭湰瀵硅薄","鎴愭湰瀵硅薄鍚嶇О","HBillStatus","HBillType","HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID","閫夋嫨","鏌ヨ鏃ユ湡","鎴愭湰瀵硅薄","鎴愭湰瀵硅薄鍚嶇О","HBillStatus","HBillType","HPRDORGID","HCenterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
-
+            //宸ヤ綔涓績鍒楄〃
+            getWorkCenter();
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
@@ -269,11 +278,11 @@
                         , { field: '鍖呰鏍囪瘑浠g爜', title: '鍖呰鏍囪瘑浠g爜', width: 115 }
                         , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 115 }
                         , {
-                            field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, templet: function (d) {
-                                if (d.鍑虹珯鏃堕棿 == null) {
+                            field: '姹囨姤鏃ユ湡', title: '姹囨姤鏃ユ湡', width: 160, templet: function (d) {
+                                if (d.姹囨姤鏃ユ湡 == null) {
                                     return "";
                                 }
-                                return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
+                                return util.toDateString(d.姹囨姤鏃ユ湡, "yyyy-MM-dd HH:mm:ss");
                             }
                         }
                         , { field: 'HEmpID', title: 'HEmpID', hide: true }
@@ -306,6 +315,26 @@
                 $('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
                 $('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
                 //$('#btn-Exit').addClass("layui-btn-disabled").attr("disabled", true);//閫�鍑烘寜閽�
+            }
+
+            //鑾峰彇宸ヤ綔涓績鍒楄〃
+            function getWorkCenter() {
+                var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Sc_ICMOBill/GetHWorkCenterList",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HDeptName").append(HDeptName);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
             }
 
             //澶村伐鍏锋爮浜嬩欢
@@ -400,6 +429,33 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '姹囨姤鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 165;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '浜у搧浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 200;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '杞﹂棿':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                        case '鎿嶄綔鍛�':
+                                            option.cols[0][i + 1]["width"] = 110;
+                                            break;
+                                        case '宸ュ簭':
+                                            option.cols[0][i + 1]["width"] = 135;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -617,6 +673,7 @@
                 $("#HName").val("");
                 $("#HEmpNumber").val("");
                 $("#HEmpName").val("");
+                $("#HDeptName").val("0");//杞﹂棿
                 form.render('select');
                 sWhere = "";
             }
@@ -637,6 +694,7 @@
                 var HName = $("#HName").val(); //褰撳墠宸ュ簭
                 var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
                 var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
+                var HDeptName = $("#HDeptName").val();//杞﹂棿
 
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
@@ -660,12 +718,12 @@
                     sWhere += " and " + ColName+    " "+ com;
                 }
 
-                if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
-                }
-                if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= '" + HEndDate + "'";
-                }
+                //if (HBeginDate) {
+                //    sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                //}
+                //if (HEndDate) {
+                //    sWhere += " and CONVERT(varchar(100),姹囨姤鏃ユ湡, 23) <= '" + HEndDate + "'";
+                //}
                 if (HWorkBillNo) {
                     sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
                 }
@@ -693,7 +751,9 @@
                 if (HEmpName) {
                     sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
                 }
-
+                if (HDeptName && HDeptName != "0") {
+                    sWhere += " and HCenterID = '" + HDeptName + "'";
+                }
                 if (HStatus) {
                     switch (HStatus) {
                         case '-1':   //鍏ㄩ儴
@@ -759,13 +819,13 @@
                                     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 HH:mm:ss')}}</div>", width: 200 });
+                                            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 HH:mm:ss')}}</div>", width: 120 });
                                             break;
                                         default:
                                             if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺') {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                             } else {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                             }                                            
                                     }
                                 }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index f921ab2..b920d3c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>宸ュ簭娴佽浆鍗�</title>
+    <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">
@@ -42,7 +42,7 @@
         }
 
         .layui-form-label {
-            width: 25%;
+            width: 24%;
         }
 
     </style>
@@ -88,23 +88,17 @@
                                             </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" name="HQty" id="HQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline" style="display:none">
                                             <label class="layui-form-label">鏌撹壊瑕佹眰</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;" readonly>
                                             </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" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-        </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" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
-        </div>
-    </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -129,105 +123,18 @@
                                                 <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                             </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" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
-            </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" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
-                                            </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" name="HQty" id="HQty">
-                                            </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" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
-                                            </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" name="HMaterTexture" id="HMaterTexture">
-            </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="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
-            </div>
-        </div>
-        <div class="layui-col-xs3 layui-inline">
-            <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
-            <div class="layui-input-inline">
-                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
-            </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" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" 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" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+                                    
+                                    <div class="layui-row" style="display:none">                                        
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">骞呭</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" value="0" readonly>
                                             </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" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
-            </div>
-        </div>-->
                                     </div>
 
-                                    <div class="layui-row">
-                                        <!--<div class="layui-col-xs6 layui-inline">
-            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
-            <div class="layui-input-inline">
-                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
-            </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" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
-                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                </button>
-            </div>
-        </div>-->
+                                    <div class="layui-row" style="display:none">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">杈呮暟閲�</label>
                                             <div class="layui-input-inline">
@@ -251,23 +158,11 @@
                                             </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" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
-        </div>
-    </div>-->
-                                        <!--<div class="layui-col-xs3 layui-inline">
-        <label class="layui-form-label">琛ユ枡鏍囪</label>
-        <div class="layui-input-block">
-            <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
-        </div>
-    </div>-->
+                                    <div class="layui-row" style="display:none">                                       
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鍏嬮噸</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" value="0" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
@@ -285,7 +180,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none">
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
                                             <div class="layui-input-inline">
@@ -293,7 +188,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none">
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">澶囨敞2</label>
                                             <div class="layui-input-inline">
@@ -301,7 +196,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none">
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">搴曢儴澶囨敞</label>
                                             <div class="layui-input-inline">
@@ -318,19 +213,19 @@
                                         <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="HHeight" id="HHeight">
+                                                <input type="text" class="layui-input" name="HHeight" id="HHeight value="0"">
                                             </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="HInches" id="HInches">
+                                                <input type="text" class="layui-input" name="HInches" id="HInches" value="0">
                                             </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="HAl1Long" id="HAl1Long">
+                                                <input type="text" class="layui-input" name="HAl1Long" id="HAl1Long" value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -338,7 +233,7 @@
                                         <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="HDensity" id="HDensity">
+                                                <input type="text" class="layui-input" name="HDensity" id="HDensity" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -373,6 +268,41 @@
                             <!--鍏朵粬淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
+                                    <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" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                            </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" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+                                            </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" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" 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" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" 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>
@@ -490,16 +420,6 @@
                                                 <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
                                             </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" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                        <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
-                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHWorkType" id="btnSearchHWorkType" 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">
@@ -508,18 +428,6 @@
                                                 <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                             </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" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
-                                            </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" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>-->
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鑺綋鐗╂枡浠g爜</label>
                                             <div class="layui-input-inline">
@@ -571,7 +479,7 @@
                                                 <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                             </div>
                                         </div>
-                                        
+
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
                                             <div class="layui-input-inline">
@@ -593,19 +501,19 @@
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">婧愬崟瀹㈡埛浠g爜</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HCusNumber" id="HCusNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                                                <input type="text" class="layui-input" name="HCusNumber" id="HCusNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:500px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPickLabel" id="HPickLabel" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                                                <input type="text" class="layui-input" name="HPickLabel" id="HPickLabel" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:500px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑缂栫爜</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                                                <input type="text" class="layui-input" name="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:500px;">
                                             </div>
                                         </div>
                                     </div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index eb84d5c..e4fd8ec 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ュ簭娴佽浆鍗″垪琛�</title>
+    <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">
@@ -30,30 +30,25 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鎵撳嵃鐘舵��</label>
-                                    <div class="layui-input-block" style="width:100px">
-                                        <select name="city" lay-verify="required" id="SHPrintQty">
-                                            <option value="鍏ㄩ儴">鍏ㄩ儴</option>
-                                            <option value="鏈墦鍗�">鏈墦鍗�</option>
-                                            <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+                                    <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block">
+                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HDate">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-                                    <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HDate1">
+                                    <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="HWorkBillNo" id="HWorkBillNo">
                                     </div>
-                                </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>
@@ -73,20 +68,39 @@
                                             </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="HWorkBillNo" id="HWorkBillNo">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
-                                        <div class="layui-inline">
                                             <label class="layui-form-label">鍗曟嵁鍙�</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">                                      
                                         <div class="layui-inline">
+                                            <label class="layui-form-label">鎵撳嵃鐘舵��</label>
+                                            <div class="layui-input-block" style="width:100px">
+                                                <select name="city" lay-verify="required" id="SHPrintQty">
+                                                    <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+                                                    <option value="鏈墦鍗�">鏈墦鍗�</option>
+                                                    <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" id="HDate1">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">鍞竴ID</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" name="HErpID" id="HErpID">
@@ -122,23 +136,24 @@
                                 </div>
                             </div>
                         </div>
-                        <script type="text/html" id="toolbarDemo">
+                        <script type="text/html" id="toolbarDemo"> <!--琛ㄥご-->
                             <div class="layui-btn-container">
                                 <!--<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>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>鎷嗗垎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鏁村崟鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>鍒楄缃�</button>
                             </div>
                         </script>
-                        <script type="text/html" id="toolbarDemo2">
+                        <script type="text/html" id="toolbarDemo2"> <!--琛ㄤ綋-->
                             <div class="layui-btn-container">
                                 <!--<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>
@@ -154,6 +169,8 @@
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Pg"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Fg"><i class="layui-icon layui-icon-file-b"></i>杩斿伐鐢宠</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Jl"><i class="layui-icon layui-icon-file-b"></i>杩斿伐璁板綍</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print2"><i class="layui-icon layui-icon-print"></i>閫夋嫨鎵撳嵃</button>
+                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PrintSub_Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo3">
@@ -216,7 +233,7 @@
 
             //#endregion
 
-            //#region 澶村伐鍏锋爮浜嬩欢
+            //#region 琛ㄥご宸ュ叿鏍忎簨浠�
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
                     //鏂板
@@ -245,6 +262,9 @@
                         break;
                     //鎵撳嵃
                     case 'btn_print': get_print();
+                        break;                   
+                    //涓�閿墦鍗�
+                    case 'set_Print_Convenient': set_Print_Convenient();
                         break;
                     //宸ュ簭鍑虹珯姹囨姤鍗�
                     case 'set_StationOut': set_StationOut();
@@ -276,6 +296,7 @@
 
                 };
             });
+            //琛ㄤ綋宸ヨ壓娴佺▼椤电
             table.on('toolbar(mainTable2)', function (obj) {
                 switch (obj.event) {
                     //鏂板
@@ -298,7 +319,7 @@
                         break;
                     //鎵撳嵃
                     case 'btn_print': get_print();
-                        break;
+                        break;                  
                     //宸ュ簭鍑虹珯姹囨姤鍗�
                     case 'set_StationOut': set_StationOut();
                         break;
@@ -317,6 +338,12 @@
                     //宸ュ簭杩斿伐鍗曡褰�
                     case 'get_Jl': get_Jl();
                         break
+                    //閫夋嫨鎵撳嵃
+                    case 'btn_print2': get_print2();
+                        break
+                    //涓�閿墦鍗�
+                    case 'set_PrintSub_Convenient': set_PrintSub_Convenient();
+                        break;
                     //宸ュ簭娲惧伐鍗�
                     //case 'get_Pg': get_Pg();
                     //    break
@@ -360,8 +387,29 @@
                 table.render(option2);
                 //鏌ヨ
                 get_FastQuery();
+                //杞﹂棿鍒楄〃
+                getDept();
             }
 
+            //鑾峰彇杞﹂棿鍒楄〃
+            function getDept() {
+                var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HDeptName").append(HDeptName);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
@@ -373,6 +421,8 @@
                 $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
                 $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
                 $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HDeptName").val("0");//杞﹂棿
+                $("#HModel").val("");//瑙勬牸鍨嬪彿
                 //$("#btnSearch").click();
                 sWhere = "";
                 get_FastQuery();
@@ -389,6 +439,8 @@
                 var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
                 var HErpID = $("#HErpID").val();//鍞竴ID
+                var HDeptName = $("#HDeptName").val();//杞﹂棿
+                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
                 if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
                     if (SHPrintQty == "鍏ㄩ儴") {
                         sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
@@ -420,6 +472,12 @@
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+                }
+                if (HDeptName && HDeptName != "0") {
+                    sWhere += " and HWorkShopID = '" + HDeptName + "'";
+                }
+                if (HModel) {
+                    sWhere += " and 浜у搧瑙勬牸 like '%" + HModel + "%'";
                 }
                 if (HErpID) {
                     sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
@@ -1081,6 +1139,30 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '鐢熶骇璁㈠崟鍙�':
+                                            option.cols[0][i + 1]["width"] = 170;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -1281,6 +1363,30 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option3.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '鐢熶骇璁㈠崟鍙�':
+                                            option.cols[0][i + 1]["width"] = 170;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -1478,7 +1584,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+                        , title: '宸ュ簭娲惧伐鍗�-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
                     })
@@ -1591,7 +1697,7 @@
                 if (checkStatus.data.length === 1) {
                     layer.open({
                         type: 2
-                        , area: ['80%', '80%']
+                        , area: ['85%', '85%']
                         , title: '鎵撳嵃妯$増閫夋嫨'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1604,6 +1710,105 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
+            //琛ㄥご涓�閿墦鍗�
+            function set_Print_Convenient() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {                    
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HProcessExchange' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + data[0].hmainid.toString() + "," + QJQD  + "&Type=" + 'HProcessExchange' + "&OpenTmp=" + OpenTmp.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            //閫夋嫨鎵撳嵃
+            function get_print2() {
+                var checkStatus = table.checkStatus('mainTable2')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var hmainsubid = '';
+                    //鍐欏叆涓籭d 鐢ㄧ鍙�'@'涓庡瓙id闅斿紑
+                    hmainsubid = data[0].hmainid + '@';
+
+                    for (let i = 0; i < data.length; i++) {
+                        hmainsubid += data[i].hsubid + ',';  //鍐欏叆瀛恑d
+                    }
+                   //鍒犻櫎鏈�鍚庝竴涓�','绗﹀彿
+                    hmainsubid = hmainsubid.substring(hmainsubid.length - 1, 0);
+
+                    layer.open({
+                        type: 2
+                        , area: ['85%', '85%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainsubid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchanges', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+            //琛ㄤ綋涓�閿墦鍗�
+            function set_PrintSub_Convenient() {
+                var checkStatus = table.checkStatus('mainTable2')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var hmainsubid = '';
+                    //鍐欏叆涓籭d 鐢ㄧ鍙�'@'涓庡瓙id闅斿紑
+                    hmainsubid = data[0].hmainid + '@';
+
+                    for (let i = 0; i < data.length; i++) {
+                        hmainsubid += data[i].hsubid + ',';  //鍐欏叆瀛恑d
+                    }
+                    //鍒犻櫎鏈�鍚庝竴涓�','绗﹀彿
+                    hmainsubid = hmainsubid.substring(hmainsubid.length - 1, 0);
+
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HProcessExchanges' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + hmainsubid.toString() + "&Type=" + 'HProcessExchanges' + "&OpenTmp=" + OpenTmp.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
 
             //宸ュ簭鍑虹珯姹囨姤鍗�
             function set_StationOut() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index bb9425f..effef93 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ュ簭娴佽浆鍗″垪琛�(涓嬭揪)</title>
+    <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">
@@ -30,26 +30,25 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
-                                    </div>
-                                </div>
-                                <div class="layui-inline">
                                     <label class="layui-form-label">鐢熶骇杞﹂棿</label>
                                     <div class="layui-input-block">
                                         <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                             <!--鍔ㄦ�佹覆鏌撹溅闂�-->
                                         </select>
                                     </div>
-                                </div>                               
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </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="HWorkBillNo" id="HWorkBillNo">
+                                    </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>
@@ -69,9 +68,9 @@
                                             </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="HWorkBillNo" id="HWorkBillNo">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -104,12 +103,13 @@
                         <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="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelIssue"><i class="layui-icon layui-icon-file-b"></i>鍙嶄笅杈�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>宸ュ簭娲惧伐</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><i class="layui-icon layui-icon-file-b"></i>鎸囨淳鏃ユ湡</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><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-file-b"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                   <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
@@ -198,6 +198,9 @@
                         break;
                     //鎵撳嵃
                     case 'btn_print': get_print();
+                        break;
+                    //涓�閿墦鍗�
+                    case 'set_Print_Convenient': set_Print_Convenient();
                         break;
                     //宸ュ簭鍑虹珯姹囨姤鍗�
                     case 'set_StationOut': set_StationOut();
@@ -364,12 +367,15 @@
                         , { field: '瀛愪欢鍚嶇О', title: '浜у搧鍚嶇О' }
                         , { field: '瀛愪欢瑙勬牸', title: '瑙勬牸鍨嬪彿' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
-                        , { field: '鍗曚綅', title: '鍗曚綅' }
                         , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
                         , { field: 'HProcID', title: 'HProcID', hide: true }
                         , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
                         , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娲惧伐鍗曟暟閲�', width: 100 }
+                        , { field: '浠诲姟鍗曞彿', title: '鐢熶骇璁㈠崟鍙�', width: 140 }
+                        , {
+                            field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+                        }
                         , {
                             field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
                         }
@@ -379,16 +385,13 @@
                         , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
                         , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+                        , { field: '鍗曚綅', title: '鍗曚綅' }
 
 
                         , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
-                        , {
-                            field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
-                        }
                         , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
                         , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
-                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
                         , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
                         , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
                         , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
@@ -502,6 +505,30 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '浜у搧浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                        case '宸ュ簭鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 135;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -584,7 +611,7 @@
                                 }
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
-                                    option2.cols[0][i + 1]["width"] = dataCols[3];
+                                    option2.cols[0][i + 1]["width"] = dataCols[3];                                   
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
@@ -900,7 +927,7 @@
 
                     layer.open({
                         type: 2
-                        , area: ['50%', '50%']
+                        , area: ['85%', '85%']
                         , title: '鎵撳嵃妯$増閫夋嫨'
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -914,6 +941,45 @@
                 }
             }
 
+            //涓�閿墦鍗�
+            function set_Print_Convenient() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length >= 1) {
+                    var rows = [];
+                    var arr = [];
+                    var ieid = [];
+                    for (var i = 0; i < data.length; i++) {
+                        rows.push(data[i].hmainid.toString());
+                        arr.push(data[i].HEntryID.toString());
+                        ieid.push(data[i].hmainid.toString() + data[i].HEntryID.toString())
+                    }
+
+                    $.ajax({
+                        type: "get",
+                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                        async: true,
+                        data: { "HNumber": 'HProcSendWork' },
+                        //data: { "Value": Value },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html?linterid=" + rows.toString() + "&Type=" + 'HProcSendWork' + "&OpenTmp=" + OpenTmp.toString() + "&ieid=" + ieid.toString());
+                            } else {
+                                layer.msg(result.Message);
+                            }
+                        },
+                        error: function (result) {
+                            console.log(result);
+                            //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
             //宸ュ簭鍑虹珯姹囨姤鍗�
             function set_StationOut() {
                 var checkStatus = table.checkStatus('mainTable2')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePayReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePayReport.html"
index 71842b9..0738f42 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePayReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePayReport.html"
@@ -204,7 +204,7 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                DisPlay_HideColumn();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -407,6 +407,20 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i]["field"]) {
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i]["width"] = 140;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i]["width"] = 190;
+                                            break;
+                                        case '浜у搧缂栫爜':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePaySumReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePaySumReport.html"
index 44835b2..44eea7d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePaySumReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePiecePaySumReport.html"
@@ -204,7 +204,7 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                DisPlay_HideColumn();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -398,6 +398,11 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i]["field"]) {
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i]["width"] = 140;
+                                            break;                                       
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePieceWorkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePieceWorkReport.html"
index 61c216e..8e4d474 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePieceWorkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_EmployeePieceWorkReport.html"
@@ -204,7 +204,7 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                DisPlay_HideColumn();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -407,6 +407,20 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i]["field"]) {
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i]["width"] = 140;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i]["width"] = 190;
+                                            break;
+                                        case '浜у搧缂栫爜':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPReport.html"
index 45ff9d5..a5bd5b1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPReport.html"
@@ -204,7 +204,7 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                DisPlay_HideColumn();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -404,6 +404,23 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i]["field"]) {
+                                        case '鐢熶骇璁㈠崟':
+                                            option.cols[0][i]["width"] = 160;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i]["width"] = 140;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i]["width"] = 190;
+                                            break;
+                                        case '浜у搧缂栫爜':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
index f70e663..1b079f9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
@@ -204,7 +204,7 @@
                 set_InitGrid();
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-                //DisPlay_HideColumn();
+                DisPlay_HideColumn();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -404,6 +404,23 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i]["field"]) {
+                                        case '鐢熶骇璁㈠崟':
+                                            option.cols[0][i]["width"] = 160;
+                                            break;
+                                        case '鐢熶骇杞﹂棿':
+                                            option.cols[0][i]["width"] = 140;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i]["width"] = 190;
+                                            break;
+                                        case '浜у搧缂栫爜':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                        case '浜у搧鍚嶇О':
+                                            option.cols[0][i]["width"] = 155;
+                                            break;
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 705e60d..85d87ae 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -122,8 +122,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 73fa400..6b3d9b1 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -123,8 +123,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index 2c6c8da..25f83a7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -109,8 +109,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index f9787bb..4afc8bd 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -57,14 +57,14 @@
                     <div class="layui-tab" lay-filter="tab-Kf_OtherOutBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
-                            <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;" class="layui-this">琛ㄥご淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
                             <li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
                             <li lay-id="5" style="padding:1px;">鍚堣淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--閫夋嫨婧愬崟-->
-                            <div class="layui-tab-item layui-show">
+                            <div class="layui-tab-item">
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4">
@@ -147,7 +147,7 @@
                                 </div>
                             </div>
                             <!--琛ㄥご淇℃伅-->
-                            <div class="layui-tab-item">
+                            <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
index 9a38aab..d9d5612 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList.html"
@@ -112,8 +112,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -191,17 +191,9 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
-                        , { field: 'hsupid', title: 'hsupid', width: 200, hide: true }
-                        , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 }
-                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
-                        , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
-                        , { field: '涓荤', title: '涓荤', width: 200 }
-                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true }
-                        , { field: '鍙戣揣浜�', title: '鍙戣揣浜�', width: 160 }
                         , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
                         , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
                         , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
@@ -212,22 +204,30 @@
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 200 }
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 115 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
-                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 115 }
                         , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
                         , { field: '鍗曚环', title: '鍗曚环', width: 200 }
                         , { field: '閲戦', title: '閲戦', width: 200 }
+                        , { field: 'hsupid', title: 'hsupid', width: 200, hide: true }
+                        , { field: '瀹㈡埛', title: '瀹㈡埛', width: 200 }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
+                        , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
+                        , { field: '涓荤', title: '涓荤', width: 200 }
+                        , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true }
+                        , { field: '鍙戣揣浜�', title: '鍙戣揣浜�', width: 160 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 115 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
 
                     ]]
                 };
@@ -476,7 +476,7 @@
                         if (data1.data.length != 0) {
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["hmainid", "hsubid", "HEmpID", "hmanagerid", "hmaterid", "hunitid", "HWHID", "hsupid", "hsecmanagerid","hkeeperid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["hmainid", "hsubid", "HEmpID", "hmanagerid", "hmaterid", "hunitid", "HWHID", "hsupid", "hsecmanagerid","hkeeperid","HDeptID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
@@ -495,6 +495,51 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鍗曚环':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '閲戦':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '棰嗘枡浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 180;
+                                            break;
+                                        case '浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '棰嗘枡鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '涓荤':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '閮ㄩ棬':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 05244c6..7be8546 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -111,8 +111,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -343,6 +343,51 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 110;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '棰嗘枡鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '涓荤':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '閮ㄩ棬':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鍗曚环':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '閲戦':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '棰嗘枡浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 180;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 3d576c6..9fbad73 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -64,7 +64,7 @@
                                         <div class="layui-col-xs8">
                                             <select name=" HBillType" id="HBillType">
                                                 <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
-                                                <option value="1214" selected>鐢熶骇鍙戞枡閫氱煡鍗�</option>
+                                                <option value="1214" selected>鐢熶骇澶囪揣鍗�</option>
                                                 <option value="-1">鎵嬪伐褰曞叆</option>
                                             </select>
                                         </div>
@@ -469,7 +469,7 @@
                             $("#HBillType").empty();
                             $("#HBillType").val("1214");
                             var optionHtml = '';
-                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇澶囪揣鍗�' + "</option>";
                             $("#HBillType").append(optionHtml);
                             layui.form.render('select');
                             $("#HBillType").attr("readonly", "readonly");
@@ -1128,7 +1128,7 @@
                                     $("#HBillType").empty();
                                     $("#HBillType").val("1214");
                                     var optionHtml = '';
-                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇澶囪揣鍗�' + "</option>";
                                     $("#HBillType").append(optionHtml);
                                     layui.form.render('select');
                                     $("#HBillType").attr("readonly", "readonly");
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
index 0643d47..d63e437 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
@@ -89,8 +89,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -179,16 +179,6 @@
                     , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200, sort: true }
                     , { field: 'HBillSubType', title: '鍗曟嵁绫诲瀷', width: 200, hide: true }
-                    , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
-                    , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 110 }
-                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                    , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
-                    , { field: 'HMangerID', title: 'HMangerID', width: 200, hide: true }
-                    , { field: '涓荤', title: '涓荤', width: 200 }
-                    , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
-                    , { field: '楠屾敹', title: '楠屾敹', width: 200 }
-                    , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
-                    , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
                     , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                     , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
                     , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
@@ -202,6 +192,16 @@
                     , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 }
                     , { field: '鍗曚环', title: '鍗曚环', width: 200 }
                     , { field: '閲戦', title: '閲戦', width: 200 }
+                    , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+                    , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 110 }
+                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                    , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
+                    , { field: 'HMangerID', title: 'HMangerID', width: 200, hide: true }
+                    , { field: '涓荤', title: '涓荤', width: 200 }
+                    , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
+                    , { field: '楠屾敹', title: '楠屾敹', width: 200 }
+                    , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true }
+                    , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
                     , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                     , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', width: 200 }
                     , { field: '浠撳簱', title: '浠撳簱', width: 200 }
@@ -461,6 +461,51 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 115;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 140;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鍗曚环':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '閲戦':
+                                            option.cols[0][i + 1]["width"] = 70;
+                                            break;
+                                        case '棰嗘枡浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 180;
+                                            break;
+                                        case '浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '棰嗘枡鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '涓荤':
+                                            option.cols[0][i + 1]["width"] = 85;
+                                            break;
+                                        case '閮ㄩ棬':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
index b2ef8c6..bc2877a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBillList.html"
@@ -108,8 +108,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></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>
@@ -296,7 +296,7 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
                         , { field: 'HCusID', title: 'HCusID', width: 160, hide: true }
@@ -326,15 +326,15 @@
                         , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 200 }
                         , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                     ]]
                 };
             }
@@ -414,6 +414,41 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 110;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                        case '閮ㄩ棬':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '楠屾敹鍛�':
+                                            option.cols[0][i + 1]["width"] = 100;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 100;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鏁伴噺':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '璁¢噺鍗曚綅':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 170;
+                                            break;                                      
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index 823f8a2..ba11a54 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -108,8 +108,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></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>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index eccc9d2..7d66442 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -118,8 +118,8 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
@@ -215,7 +215,7 @@
                 var columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
                     , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                     , { field: 'hsupid', title: 'hsupid', width: 160, hide: true }
                     , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
@@ -245,15 +245,15 @@
                     , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                     , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 115 }
                     , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
 
                 ];
                 option = {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 2cc2f8a..ab09f61 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -88,8 +88,8 @@
                         <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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -167,7 +167,7 @@
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"  }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: 'hsupid', title: 'hsupid', width: 160, hide: true }
                         , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
@@ -197,15 +197,15 @@
                         , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                         , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 115 }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd ')}}</div>" }
                         , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
 
                     ]]
                 };
@@ -442,6 +442,47 @@
                                 //璁剧疆鍒楀
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
+                                    switch (option.cols[0][i + 1]["field"]) {
+                                        case '鏃ユ湡':
+                                            option.cols[0][i + 1]["width"] = 110;
+                                            break;
+                                        case '鍗曟嵁鍙�':
+                                            option.cols[0][i + 1]["width"] = 145;
+                                            break;
+                                        case '渚涘簲鍟�':
+                                            option.cols[0][i + 1]["width"] = 270;
+                                            break;
+                                        case '楠屾敹鍛�':
+                                            option.cols[0][i + 1]["width"] = 100;
+                                            break;
+                                        case '淇濈鍛�':
+                                            option.cols[0][i + 1]["width"] = 100;
+                                            break;
+                                        case '鐗╂枡浠g爜':
+                                            option.cols[0][i + 1]["width"] = 150;
+                                            break;
+                                        case '鐗╂枡鍚嶇О':
+                                            option.cols[0][i + 1]["width"] = 250;
+                                            break;
+                                        case '瑙勬牸鍨嬪彿':
+                                            option.cols[0][i + 1]["width"] = 190;
+                                            break;
+                                        case '鏁伴噺':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '璁¢噺鍗曚綅':
+                                            option.cols[0][i + 1]["width"] = 90;
+                                            break;
+                                        case '鏀舵枡浠撳簱':
+                                            option.cols[0][i + 1]["width"] = 205;
+                                            break;
+                                        case '婧愬崟鍗曞彿':
+                                            option.cols[0][i + 1]["width"] = 155;
+                                            break;
+                                        case '閲囪喘璁㈠崟鍙�':
+                                            option.cols[0][i + 1]["width"] = 160;
+                                            break;
+                                    }  
                                 }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {

--
Gitblit v1.9.1