From 244b147c94292d6002442dd4324a936b7cbe2bf8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 18 三月 2024 18:58:05 +0800
Subject: [PATCH] 网页版:计划管理、生产管理 全部模块, 选择F7和按钮 基础资料的弹框, 全部改为 基础资料列表 的方式;

---
 WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html             |   24 
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html       |    8 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html                     |    6 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit.html                       |   26 
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html           |   24 
 WebTM/views/生产管理/生产投料单/Sc_PPBomBill.html                          |   38 +-
 WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html             |   54 +-
 WebTM/views/生产管理/生产报表/Sc_ProdOrderPickingStatusReport.html        |    8 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html       |   14 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html                  |   38 +-
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html               |   18 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html                |    6 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html              |   20 
 WebTM/views/计划管理/产线返修平台/Sc_SourceLineRepairBill.html              |   16 
 WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html            |    4 
 WebTM/views/生产管理/报工台工序/完工/Sc_Add_MESEndStepWorkBillList.html      |   22 
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html                 |    4 
 WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html                 |    8 
 WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html          |    8 
 WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html            |   23 +
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html |   22 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html                   |   18 
 WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html   |   24 
 WebTM/views/生产管理/要料计划/JIT_NeedMaterPlanBillList.html              |    4 
 WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html     |   22 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html              |   20 
 WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html           |    8 
 WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html          |    8 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html     |   14 
 WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html   |   26 
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html            |    2 
 WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html    |   24 
 WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html            |   24 
 WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html            |    4 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                   |   12 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList_His.html                 |    6 
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html     |   14 
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html       |   10 
 WebTM/views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html          |   16 
 WebTM/views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html              |    4 
 WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html           |   12 
 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html         |   12 
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html                  |    8 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillSubList.html                  |    6 
 WebTM/views/计划管理/产线质检平台/Sc_ICMOBillQualityStatus_Tmp.html         |   22 
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html                 |   24 
 WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html          |   18 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html               |    6 
 WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html                  |   12 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                         |   14 
 WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html            |   27 +
 WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html                  |    4 
 WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html                    |   10 
 53 files changed, 431 insertions(+), 395 deletions(-)

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_Add_Edit.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_Add_Edit.html"
index 0ec1229..13b2bd0 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_Add_Edit.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_Add_Edit.html"
@@ -458,7 +458,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -466,9 +466,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
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_Group_Add_Edit.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_Group_Add_Edit.html"
index adf4b72..3753e30 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_Group_Add_Edit.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_Group_Add_Edit.html"
@@ -402,7 +402,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -410,7 +410,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
                         $("#HProcID").val(checkStatus.data[0].HItemID);
                         $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -428,7 +428,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -436,9 +436,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
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 eee91ef..445b123 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"
@@ -754,7 +754,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -762,9 +762,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -780,7 +780,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -788,7 +788,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
                         $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -880,7 +880,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -888,7 +888,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroup").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -905,7 +905,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓嶈壇浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -913,7 +913,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HBadWHName").val(checkStatus.data[0].HName);
+                        $("#HBadWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HBadWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -930,7 +930,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鎶ュ簾浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -938,7 +938,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWasterWHName").val(checkStatus.data[0].HName);
+                        $("#HWasterWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWasterWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -955,7 +955,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐮斿彂涓嶈壇鍝佷粨搴撳垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -963,7 +963,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HBadCountDevelopWHName").val(checkStatus.data[0].HName);
+                        $("#HBadCountDevelopWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HBadCountDevelopWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -980,7 +980,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '濮斿涓嶈壇浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -988,7 +988,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWWBadWHName").val(checkStatus.data[0].HName);
+                        $("#HWWBadWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWWBadWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1005,7 +1005,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '濮斿鎶ュ簾浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1013,7 +1013,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWWWasterWHName").val(checkStatus.data[0].HName);
+                        $("#HWWWasterWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWWWasterWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1030,7 +1030,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鑹搧浠撳簱鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=0&HOrgID=' + sessionStorage["OrganizationID"], 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1038,7 +1038,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
                         $("#HWHID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
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 3ffabd3..9f4a49f 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"
@@ -550,7 +550,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -558,7 +558,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
                         $("#HProcID").val(checkStatus.data[0].HItemID);
                         $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -576,7 +576,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -584,9 +584,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -602,7 +602,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -610,7 +610,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
                         $("#HCenterID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -627,7 +627,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -635,7 +635,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroup").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index c02e293..753d734 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -619,15 +619,24 @@
             form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
                 layer.open({
                     type: 2
-                    , area: ['666px', '666px']
+                    , area: ['80%', '80%']
                     , title: '閮ㄩ棬鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
             });
@@ -669,9 +678,9 @@
 
         });
         function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
-            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
             $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
+            $("#HDeptNumber").val(obj[0].閮ㄩ棬浠g爜);
 
         }
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
index f26ae2f..e5bec8e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
@@ -608,7 +608,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -618,7 +618,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -646,7 +646,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -656,7 +656,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkerName").val(checkStatus.data[0].HName);
+                        $("#HWorkerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HWorkerID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -684,7 +684,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -694,7 +694,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -722,7 +722,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -732,7 +732,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 822c570..98a52d4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -680,7 +680,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -690,8 +690,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -719,7 +719,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -729,7 +729,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -757,7 +757,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -767,7 +767,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkManName").val(checkStatus.data[0].HName);
+                        $("#HWorkManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HWorkManID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -797,7 +797,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -807,7 +807,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
index 0cc9161..f8fbaec 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
@@ -655,7 +655,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../PublicPage/SourceInformation.html', 'yes']
+                    , content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -663,7 +663,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -680,7 +680,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -688,7 +688,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -705,7 +705,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '妫�楠屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../PublicPage/UserInformation.html', 'yes']
+                    , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -713,7 +713,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCheckManName").val(checkStatus.data[0].HName);
+                        $("#HCheckManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HCheckManID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index 66c679a..44dbf9e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -746,7 +746,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -756,8 +756,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -785,7 +785,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -795,7 +795,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -823,7 +823,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -833,8 +833,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
-                        $("#HEmpNumber").val(checkStatus.data[0].HNumber);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpNumber").val(checkStatus.data[0].鑱屽憳浠g爜);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -864,7 +864,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -874,8 +874,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
-                        $("#HGroupNumber").val(checkStatus.data[0].HNumber);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
+                        $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠g爜);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index e34e203..8a5c8a2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -715,7 +715,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -725,8 +725,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -754,7 +754,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -764,7 +764,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -792,7 +792,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -802,7 +802,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -832,7 +832,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -842,7 +842,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -870,7 +870,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -880,7 +880,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
index ecfd125..78a45dc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_Add_MESEndStepWorkBillList.html"
@@ -604,7 +604,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -614,8 +614,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -643,7 +643,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -653,7 +653,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -681,7 +681,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -691,7 +691,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -721,7 +721,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -731,7 +731,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -759,7 +759,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -769,7 +769,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index ec1caea..65439ec 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -879,7 +879,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -889,10 +889,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
+                        $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -919,7 +919,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -929,7 +929,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -957,7 +957,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -967,7 +967,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -997,7 +997,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1007,7 +1007,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1035,7 +1035,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/DeptInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1045,7 +1045,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index ca1fe47..3c933d4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -744,7 +744,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -754,10 +754,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
+                        $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -822,7 +822,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -832,7 +832,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -860,7 +860,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -870,7 +870,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkerName").val(checkStatus.data[0].HName);
+                        $("#HWorkerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HWorkerID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -900,7 +900,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -910,7 +910,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -933,12 +933,12 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐝粍鍒楄〃',
+                    title: '閮ㄩ棬鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/DeptInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -948,7 +948,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
index 548f243..26a9027 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
@@ -573,7 +573,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -583,10 +583,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
+                        $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -613,7 +613,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -623,7 +623,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -651,7 +651,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -661,7 +661,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkerName").val(checkStatus.data[0].HName);
+                        $("#HWorkerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HWorkerID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -689,7 +689,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -699,7 +699,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -727,7 +727,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/DeptInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -737,7 +737,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
index 7c2e4c0..ad4f345 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlaBillnList.html"
@@ -475,7 +475,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -485,7 +485,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 88c0339..8d6b041 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -874,7 +874,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -888,9 +888,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HMaterModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -908,7 +908,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -921,7 +921,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HUnitID": checkStatus.data[0].HItemID
-                                        , "HUnitIDName": checkStatus.data[0].HName
+                                        , "HUnitIDName": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -939,7 +939,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -952,7 +952,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HWorkShopID": checkStatus.data[0].HItemID
-                                        , "HWorkShopIDName": checkStatus.data[0].HName
+                                        , "HWorkShopIDName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -970,7 +970,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -983,7 +983,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HPurchaseDeptID": checkStatus.data[0].HItemID
-                                        , "HPurchaseDeptIDName": checkStatus.data[0].HName
+                                        , "HPurchaseDeptIDName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index 61d0a4d..1a2b0f8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -465,7 +465,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -474,10 +474,10 @@
                         return layer.msg('璇烽�夋嫨鏁版嵁');
                     }
                     //鑾峰彇鏁版嵁
-                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
-                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
-                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
index 0bfc59e..d9dd126 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Add.html"
@@ -349,7 +349,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -363,9 +363,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HMaterModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
index bb3ef07..6c6fceb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBillList.html"
@@ -287,7 +287,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -297,7 +297,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 3c5f5d3..3ee1081 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -339,7 +339,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
index 3889817..4d0c070 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -435,7 +435,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -445,7 +445,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -461,7 +461,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -470,10 +470,10 @@
                         return layer.msg('璇烽�夋嫨鏁版嵁');
                     }
                     //鑾峰彇鏁版嵁
-                    $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
-                    $("#HMaterName").val(checkStatus.data[0].HName);//鐗╂枡鍚嶇О
-                    $("#HMaterModel").val(checkStatus.data[0].HModel);//鐗╂枡瑙勬牸鍨嬪彿
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//鐗╂枡浠g爜
+                    $("#HMaterID").val(checkStatus.data[0].HItemID);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
index 8107a08..6f273db 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBill_Add.html"
@@ -350,7 +350,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -363,8 +363,8 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HWorkShopID": checkStatus.data[0].HItemID
-                                        ,"HWorkShopNumber": checkStatus.data[0].HNumber
-                                        , "HWorkShopName": checkStatus.data[0].HName
+                                        , "HWorkShopNumber": checkStatus.data[0].閮ㄩ棬浠g爜
+                                        , "HWorkShopName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -381,7 +381,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -395,9 +395,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HMaterModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index e6bd38d..6028cf2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -315,7 +315,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -325,7 +325,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMATERIALID").val(checkStatus.data[0].HItemID);
-                    $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+                    $("#HMATERIALNAME").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -340,7 +340,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '閮ㄩ棬鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -350,7 +350,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    $("#DeptNAME").val(checkStatus.data[0].HName);
+                    $("#DeptNAME").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index b082389..289c887 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -372,7 +372,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -382,7 +382,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMATERIALID").val(checkStatus.data[0].HItemID);
-                    $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+                    $("#HMATERIALNAME").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index a133468..b59fae9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -360,7 +360,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -370,7 +370,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMATERIALID").val(checkStatus.data[0].HItemID);
-                    $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+                    $("#HMATERIALNAME").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -385,7 +385,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '渚涘簲鍟嗗垪琛�'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -395,7 +395,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
-                    $("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
+                    $("#HSUPPLIERNAME").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index 1af275c..05a0e3f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -326,7 +326,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -336,7 +336,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMATERIALID").val(checkStatus.data[0].HItemID);
-                    $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+                    $("#HMATERIALNAME").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
@@ -351,7 +351,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '閮ㄩ棬鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -361,7 +361,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    $("#DeptNAME").val(checkStatus.data[0].HName);
+                    $("#DeptNAME").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
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_ICMOBillEdit.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_ICMOBillEdit.html"
index 6bc5fe4..50a6a0f 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_ICMOBillEdit.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_ICMOBillEdit.html"
@@ -629,7 +629,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '瀹㈡埛'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -639,7 +639,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HCusID").val(checkStatus.data[0].HItemID);
-                        $("#HCusName").val(checkStatus.data[0].HName);
+                        $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -655,7 +655,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヤ綔涓績'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -665,7 +665,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HCenterID").val(checkStatus.data[0].HItemID);
-                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -706,7 +706,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -720,9 +720,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -739,7 +739,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -769,7 +769,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -782,7 +782,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HDeptID": checkStatus.data[0].HItemID
-                                        , "HDeptName": checkStatus.data[0].HName
+                                        , "HDeptName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -798,7 +798,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -810,7 +810,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "HUnitName": checkStatus.data[0].HName
+                                        "HUnitName": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
index 1f62a27..20b117b 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
@@ -783,7 +783,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '瀹㈡埛'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../BaseSet/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -811,7 +811,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: "鐢熶骇杞﹂棿鍒楄〃"  //鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -821,7 +821,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -837,7 +837,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヤ綔涓績'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -847,7 +847,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HCenterID").val(checkStatus.data[0].HItemID);
-                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -922,7 +922,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -932,7 +932,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HUnitID").val(checkStatus.data[0].HItemID);
-                        $("#HUnitName").val(checkStatus.data[0].HName);
+                        $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -948,7 +948,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -958,7 +958,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HAuxUnit").val(checkStatus.data[0].HItemID);
-                        $("#HAuxUnitName").val(checkStatus.data[0].HName);
+                        $("#HAuxUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index bd830a4..e913ce0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -721,7 +721,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -731,8 +731,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -760,7 +760,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -770,7 +770,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -798,7 +798,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -808,7 +808,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -838,7 +838,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -848,7 +848,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -871,12 +871,12 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐝粍鍒楄〃',
+                    title: '杞﹂棿鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -886,7 +886,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index b35cdf0..f9d8ede 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -598,7 +598,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -608,8 +608,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterCode").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -637,7 +637,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -647,7 +647,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -675,7 +675,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -685,7 +685,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -715,7 +715,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -725,7 +725,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -748,12 +748,12 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐝粍鍒楄〃',
+                    title: '閮ㄩ棬鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -763,7 +763,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
index 014ee03..9bb54dc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -167,6 +167,11 @@
             });
             //#endregion
 
+            //閫夋嫨鐢熶骇璧勬簮
+            form.on('submit(btnHSource)', function () {
+                get_checkHSource();
+            });
+
             //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -411,6 +416,28 @@
             }
             //#endregion
 
+            function get_checkHSource() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
 
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index 250faf5..3d44e9b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -733,7 +733,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -743,10 +743,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
+                        $("#HMaterSpec").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -773,7 +773,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -783,7 +783,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -811,7 +811,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -821,7 +821,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -851,7 +851,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -861,7 +861,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -889,7 +889,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -899,7 +899,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
index 11df56d..815dc31 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBill.html"
@@ -578,7 +578,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -592,9 +592,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
-                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -610,7 +610,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -622,9 +622,9 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
-                                        , "HUnitNumber": checkStatus.data[0].HNumber
+                                        , "HUnitNumber": checkStatus.data[0].璁¢噺鍗曚綅浠g爜
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -638,7 +638,7 @@
                                 , area: ['90%', '90%']//澶у皬
                                 , title: '浠撳簱鍒楄〃'//鏍囬
                                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
                                 , btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -648,7 +648,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "浠撳簱": checkStatus.data[0].HName
+                                        "浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
                                         ,"HWHID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -666,7 +666,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -678,7 +678,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "浠撲綅": checkStatus.data[0].HName
+                                        "浠撲綅": checkStatus.data[0].浠撲綅鍚嶇О
                                         ,"HSPID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
@@ -695,7 +695,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -707,7 +707,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "鍩烘湰璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "鍩烘湰璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         ,"HBASEUNITID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
@@ -747,7 +747,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐗╂枡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -755,7 +755,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -770,7 +770,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '璁¢噺鍗曚綅鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -778,7 +778,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HUnitName").val(checkStatus.data[0].HName);
+                        $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
                         $("#HUnitID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -793,7 +793,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -801,7 +801,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
index 89a52bb..ec90433 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_ProdOrderPickingStatusReport.html"
@@ -357,7 +357,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -367,9 +367,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 2de678f..3ec3ec8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -965,7 +965,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -977,12 +977,12 @@
                             case 1:
                                 //鑾峰彇鏁版嵁
                                 $("#HDeptID").val(checkStatus.data[0].HItemID);//璁″垝閮ㄩ棬id
-                                $("#HDeptIDName").val(checkStatus.data[0].HName);//璁″垝閮ㄩ棬鍚嶇О
+                                $("#HDeptIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//璁″垝閮ㄩ棬鍚嶇О
                                 break;
                             case 2:
                                 //鑾峰彇鏁版嵁
                                 $("#HWorkShopID").val(checkStatus.data[0].HItemID);//鐢熶骇杞﹂棿id
-                                $("#HWorkShopIDName").val(checkStatus.data[0].HName);//鐢熶骇杞﹂棿鍚嶇О
+                                $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//鐢熶骇杞﹂棿鍚嶇О
                                 break;
                         }
 
@@ -1001,7 +1001,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐗╂枡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1011,9 +1011,9 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterIDNumber").val(checkStatus.data[0].HNumber);
-                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1055,7 +1055,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鍗曚綅鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1065,7 +1065,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HUnitID").val(checkStatus.data[0].HItemID);
-                        $("#HUnitIDName").val(checkStatus.data[0].HName);
+                        $("#HUnitIDName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1081,7 +1081,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鑱屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1094,12 +1094,12 @@
                             case 1:
                                 //鑾峰彇鏁版嵁
                                 $("#HWorkerID").val(checkStatus.data[0].HItemID);
-                                $("#HWorkerIDName").val(checkStatus.data[0].HName);
+                                $("#HWorkerIDName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                                 break;
                             case 2:
                                 //鑾峰彇鏁版嵁
                                 $("#HEmpID").val(checkStatus.data[0].HItemID);
-                                $("#HEmpIDName").val(checkStatus.data[0].HName);
+                                $("#HEmpIDName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                                 break;
                         }
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 3a288bb..dfac29b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -414,7 +414,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -424,7 +424,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 310f872..5309e07 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -365,9 +365,9 @@
                     "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                     "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                     "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
-                    "HSourceBillType":0
+                    "HSourceBillType": 0
                 };
-              
+
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -403,7 +403,7 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -413,7 +413,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -453,7 +453,7 @@
                             "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                             "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                             "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
-                            "HSourceBillType": 0,"HICMOTempID":0
+                            "HSourceBillType": 0, "HICMOTempID": 0
                         }];
                         table.render(option);
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -718,7 +718,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/PartInformation.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -730,9 +730,9 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HMaterID: checkStatus.data[0].HItemID,
-                                        HMaterCode: checkStatus.data[0].HNumber,
-                                        HMaterName: checkStatus.data[0].HName,
-                                        HMaterSpec: checkStatus.data[0].HModel,
+                                        HMaterCode: checkStatus.data[0].鐗╂枡浠g爜,
+                                        HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О,
+                                        HMaterSpec: checkStatus.data[0].瑙勬牸鍨嬪彿,
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -756,7 +756,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -770,8 +770,8 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HUnitID: checkStatus.data[0].HItemID,
-                                        HUnitCode: checkStatus.data[0].HNumber,
-                                        HUnitName: checkStatus.data[0].HName
+                                        HUnitCode: checkStatus.data[0].璁¢噺鍗曚綅浠g爜,
+                                        HUnitName: checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     });
 
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -797,7 +797,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -811,8 +811,8 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HSourceID: checkStatus.data[0].HItemID,
-                                        HSourceCode: checkStatus.data[0].HNumber,
-                                        HSourceName: checkStatus.data[0].HName
+                                        HSourceCode: checkStatus.data[0].鐢熶骇璧勬簮浠g爜,
+                                        HSourceName: checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
                                     });
 
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -838,7 +838,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/UserInformation.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -852,8 +852,8 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HWorkerid: checkStatus.data[0].HItemID,
-                                        HWorkerCode: checkStatus.data[0].HNumber,
-                                        HWorkerName: checkStatus.data[0].HName
+                                        HWorkerCode: checkStatus.data[0].鑱屽憳浠g爜,
+                                        HWorkerName: checkStatus.data[0].鑱屽憳鍚嶇О
                                     });
 
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -899,7 +899,7 @@
                     , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟鍐呯爜', edit: 'text', width: 100, hide: true }
                     , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
 
-                    , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100, hide: true  }
+                    , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', edit: 'text', width: 100, hide: true }
                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
                     , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
@@ -935,8 +935,8 @@
                     , { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
                     , { field: 'HWorkerCode', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', event: 'HWorkerCode', width: 100 }
                     , { field: 'HWorkerName', title: '鎿嶄綔鍛樺悕绉�', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '鐢熶骇鏁伴噺', edit: 'text', width: 100, totalRow: true}
-                    , { field: 'HBadQty', title: '涓嶈壇鏁伴噺', edit: 'text', width: 100, totalRow: true}
+                    , { field: 'HQty', title: '鐢熶骇鏁伴噺', edit: 'text', width: 100, totalRow: true }
+                    , { field: 'HBadQty', title: '涓嶈壇鏁伴噺', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', edit: 'text', width: 100 }
                     , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
@@ -998,7 +998,7 @@
                     "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "",
                     "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HBadQty": 0,
                     "HICMOBillNo": "", "HICMOInterID": "0", "HICMOEntryID": "0", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "",
-                    "HSourceBillType": 0,"HICMOTempID":0
+                    "HSourceBillType": 0, "HICMOTempID": 0
                 }];
                 table.render(option);
             }
@@ -1272,7 +1272,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鑱屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1280,7 +1280,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1297,7 +1297,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1305,9 +1305,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 215c28c..73fc6f5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -1158,7 +1158,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1168,9 +1168,9 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMaterID").val(checkStatus.data[0].HItemID);
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                    $("#HMaterName").val(checkStatus.data[0].HName);
-                    $("#HMaterModel").val(checkStatus.data[0].HModel);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
index 46fd62d..191ed50 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -336,7 +336,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -346,7 +346,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
index 3978e26..0d52020 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillEdit.html"
@@ -693,7 +693,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -705,7 +705,7 @@
                         }
                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptIDName").val(checkStatus.data[0].HName);
+                        $("#HDeptIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                 })
@@ -755,7 +755,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -769,9 +769,9 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID
-                                        , "HMaterNumber": checkStatus.data[0].HNumber
-                                        , "HMaterName": checkStatus.data[0].HName
-                                        , "HMaterModel": checkStatus.data[0].HModel
+                                        , "HMaterNumber": checkStatus.data[0].鐗╂枡浠g爜
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                        , "HMaterModel": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -789,7 +789,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_UnitList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -802,7 +802,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HUnitID": checkStatus.data[0].HItemID
-                                        , "HUnitIDName": checkStatus.data[0].HName
+                                        , "HUnitIDName": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
@@ -820,7 +820,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html", "yes"]
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -833,7 +833,7 @@
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HICMOEmpID": checkStatus.data[0].HItemID
-                                        , "HICMOEmpIDName": checkStatus.data[0].HName
+                                        , "HICMOEmpIDName": checkStatus.data[0].閮ㄩ棬鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
index fa1437d..f9f3654 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\246\201\346\226\231\350\256\241\345\210\222/JIT_NeedMaterPlanBillList.html"
@@ -423,7 +423,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -433,7 +433,7 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
-                    $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+                    $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 443ae33..3659c71 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -649,7 +649,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/SourceInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -657,7 +657,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -674,7 +674,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -682,7 +682,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -699,7 +699,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '妫�楠屽憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -707,7 +707,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCheckManName").val(checkStatus.data[0].HName);
+                        $("#HCheckManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HCheckManID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index 51a4c44..ef94820 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -359,7 +359,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐗╂枡鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -369,9 +369,9 @@
                     }
                     //鑾峰彇鏁版嵁
                     $("#HMaterID").val(checkStatus.data[0].HItemID);
-                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                    $("#HMaterName").val(checkStatus.data[0].HName);
-                    $("#HMaterModel").val(checkStatus.data[0].HModel);
+                    $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                    $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                    $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
                     layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                 }
                 , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\264\250\346\243\200\345\271\263\345\217\260/Sc_ICMOBillQualityStatus_Tmp.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\264\250\346\243\200\345\271\263\345\217\260/Sc_ICMOBillQualityStatus_Tmp.html"
index 7fa6ff2..fae6657 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\264\250\346\243\200\345\271\263\345\217\260/Sc_ICMOBillQualityStatus_Tmp.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\264\250\346\243\200\345\271\263\345\217\260/Sc_ICMOBillQualityStatus_Tmp.html"
@@ -905,7 +905,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -917,7 +917,7 @@
                         }
 
                         $("#HCheckManID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        $("#HCheckManName").val(checkStatus.data[0].HName);//鍚嶇О
+                        $("#HCheckManName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -965,7 +965,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["", "yes"]
+                    , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html", "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -977,8 +977,8 @@
                         }
 
                         layer.msg("涓嶈壇绫诲瀷");
-                        //$("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        //$("#HBadTypeName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
+                        $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -996,7 +996,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["", "yes"]
+                    , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadResult.html", "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -1008,8 +1008,8 @@
                         }
 
                         layer.msg("涓嶈壇鍚庢灉");
-                        //$("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        //$("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
+                        $("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍚庢灉鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -1027,7 +1027,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["", "yes"]
+                    , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html", "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -1039,8 +1039,8 @@
                         }
 
                         layer.msg("鎶ュ簾鍘熷洜");
-                        //$("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        //$("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
+                        $("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
index ce35971..fc5ffbe 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
@@ -936,7 +936,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID", "yes"]
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -948,7 +948,7 @@
                         }
 
                         $("#HEmpID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        $("#HEmpName").val(checkStatus.data[0].HName);//鍚嶇О
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -996,7 +996,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["", "yes"]
+                    , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html", "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -1008,8 +1008,8 @@
                         }
 
                         layer.msg("涓嶈壇绫诲瀷");
-                        //$("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        //$("#HBadTypeName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
+                        $("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
@@ -1027,7 +1027,7 @@
                     , shift: 2                                          //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"]                              //绐椾綋澶у皬
                     , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ["", "yes"]
+                    , content: ["../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadResult.html", "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -1039,8 +1039,8 @@
                         }
 
                         layer.msg("涓嶈壇鍚庢灉");
-                        //$("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
-                        //$("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                        $("#HBadResultID").val(checkStatus.data[0].HItemID);//鍐呯爜
+                        $("#HBadResultName").val(checkStatus.data[0].涓嶈壇鍚庢灉鍚嶇О);//鍚嶇О
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                     , btn2: function (index, layero) { }
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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
index 51d80cb..908462f 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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
@@ -622,7 +622,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
                         //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -633,7 +633,7 @@
                         }
 
                         $("#HDeptID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
-                        $("#HDeptName").val(checkStatus.data[0].HName);//閮ㄩ棬鍚嶇О
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//閮ㄩ棬鍚嶇О
 
                         layer.close(layer.index);
                     }
@@ -686,7 +686,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["90%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鎸夐挳涓�  鐨勫洖璋�
@@ -698,9 +698,9 @@
                         }
 
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
 
                         layer.close(index);//鍏抽棴寮圭獥
                     }
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 ab5cbcf..5f0bb8c 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"
@@ -1147,7 +1147,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '璁¢噺鍗曚綅琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1157,7 +1157,7 @@
                         }
                         //鑾峰彇鏁版嵁
                         $("#HUnitID").val(checkStatus.data[0].HItemID);//璁¢噺鍗曚綅id
-                        $("#HUnitName").val(checkStatus.data[0].HName);//璁¢噺鍗曚綅鍚嶇О
+                        $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);//璁¢噺鍗曚綅鍚嶇О
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1225,7 +1225,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ヨ壓璺嚎澶х被鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_RoutingGroup.html', 'yes']
+                    , content: ['../../璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1234,8 +1234,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         //鑾峰彇鏁版嵁
-                        $("#HRoutingGroupID").val(checkStatus.data[0].HItemID);//宸ヨ壓璺嚎澶х被id
-                        $("#HRoutingGroupIDName").val(checkStatus.data[0].HName);//宸ヨ壓璺嚎澶х被鍚嶇О
+                        $("#HRoutingGroupID").val(checkStatus.data[0].id);//宸ヨ壓璺嚎澶х被id
+                        $("#HRoutingGroupIDName").val(checkStatus.data[0].鍚嶇О);//宸ヨ壓璺嚎澶х被鍚嶇О
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1562,7 +1562,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ["../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html", "yes"]
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html", "yes"]
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -1574,7 +1574,7 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "宸ヤ綔涓績": checkStatus.data[0].宸ヤ綔涓績
+                                        "宸ヤ綔涓績": checkStatus.data[0].宸ヤ綔涓績鍚嶇О
                                         , "HCenterID": checkStatus.data[0].HItemID
                                         , "宸ヤ綔涓績浠g爜": checkStatus.data[0].宸ヤ綔涓績浠g爜
                                     })
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 26dc50f..6d7d730 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"
@@ -399,7 +399,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -410,8 +410,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
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_RoutingBillListQuery.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_RoutingBillListQuery.html"
index 83da366..2ea029c 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_RoutingBillListQuery.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_RoutingBillListQuery.html"
@@ -326,7 +326,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -337,8 +337,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
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_His.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_His.html"
index 161bca5..95eba40 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_His.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_His.html"
@@ -366,7 +366,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -377,8 +377,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
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_RoutingBillSubList.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_RoutingBillSubList.html"
index 7715d30..74ceb32 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_RoutingBillSubList.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_RoutingBillSubList.html"
@@ -377,7 +377,7 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -388,8 +388,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                 })
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f7120d2..69ae115 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1893,7 +1893,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1903,7 +1903,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+                        $("#HFirstCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1931,7 +1931,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1941,7 +1941,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1969,7 +1969,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -1979,7 +1979,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index fa5c6cc..a0b95bd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -2003,7 +2003,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2013,7 +2013,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HFirstCheckEmpName").val(checkStatus.data[0].HName);
+                        $("#HFirstCheckEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
                         $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -2041,7 +2041,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2051,7 +2051,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceName").val(checkStatus.data[0].HName);
+                        $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -2079,7 +2079,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2090,8 +2090,8 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
 
-                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
-                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
                         $("#HMaterID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }

--
Gitblit v1.9.1