From f546cd6176206fc7a14e52f1bd615de6916b184b Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 21 一月 2022 17:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html                   |    4 
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html              |    2 
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html                    |    4 
 WebTM/views/IpadStepIndex.html                                    |    5 
 WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html        |   68 +++++++
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html               |    2 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html              |    4 
 WebTM/views/基础资料/公用基础资料/Gy_EquipTypeEdit.html                     |    2 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html                |    2 
 WebTM/views/基础资料/公用基础资料/Gy_EquipType.html                         |    4 
 WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html               |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html             |    1 
 WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html                   |    4 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html         |    2 
 WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html         |   68 +++++++
 WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html              |    4 
 WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillList.html             |    4 
 WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html             |    4 
 WebTM/views/工资管理/Gy_WorkTypeBillEdit.html                         |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html          |    4 
 WebTM/views/工资管理/班组职员清单/Gy_GroupEmpBillList.html                  |    4 
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html                |    4 
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html                    |    2 
 WebTM/views/工资管理/Gy_WorkPayTypeBillList.html                      |    4 
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html |   69 +++++++
 WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html           |    4 
 WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillList.html      |   10 
 WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html          |   68 +++++++
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html                 |    4 
 WebTM/views/工资管理/Gy_DuSubsidyItemBillEdit.html                    |    2 
 WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html   |    2 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html                |    4 
 WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html              |    2 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html             |    4 
 WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html     |    2 
 WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html              |    4 
 WebTM/views/工资管理/核算方式/Gy_ClassTimePrjBillList.html                |    6 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html     |    2 
 WebTM/views/设备管理/设备维修派工单/Sb_EquipRepairSendWorkBillEdit.html      |    2 
 WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html             |    2 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillList.html     |    4 
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html                |    2 
 WebTM/views/设备管理/Sb_EqpConkBookBillList.html                      |    6 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                    |    2 
 WebTM/views/工资管理/Gy_WorkPayTypeBillEdit.html                      |    2 
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html       |    2 
 WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html              |    4 
 WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html              |    2 
 WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html                  |    2 
 WebTM/views/工资管理/Gy_DuSubsidyItemBillList.html                    |    4 
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html     |   68 +++++++
 WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html                   |    4 
 WebTM/views/工资管理/Gy_WorkTypeBillList.html                         |    4 
 WebTM/views/工资管理/核算方式/Gy_ClassTimePrjBillEdit.html                |    2 
 WebTM/views/设备管理/Sb_EquipDotCheckBillList.html                    |    4 
 55 files changed, 413 insertions(+), 92 deletions(-)

diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 8488760..0bb5af1 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -792,7 +792,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/涓婃枡闃查敊鍗�/Sc_Add_MaterToSourceBillList.html?OperationType=2&linterid=&HSouceBillType=',
+                content: '鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -828,7 +828,7 @@
                 , shade: 0.6
                 , maxmin: false
                 , anim: 0
-                , content: ['鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
+                , content: ['鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                 , resize: false
                 , cancel: function () {
 
@@ -854,6 +854,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+
                 content: '鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
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_EquipType.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_EquipType.html"
index 61f4bf1..f7c3e12 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_EquipType.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_EquipType.html"
@@ -175,7 +175,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_EquipType/GetList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -255,7 +255,7 @@
                                     url: GetWEBURL() + '/Gy_EquipType/Delete_EquipType',
                                     type: "GET",
                                     //async: true,
-                                    data: { "HItemID": data[0].HItemID},
+                                    data: { "HItemID": data[0].HItemID, "user": sessionStorage["HUserName"]},
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
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_EquipTypeEdit.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_EquipTypeEdit.html"
index 7bbf2ae..d10c5e6 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_EquipTypeEdit.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_EquipTypeEdit.html"
@@ -156,7 +156,7 @@
 
                 var oMain = JSON.stringify(data.field)
 
-                var sMainSub = oMain + ';' + linterid;
+                var sMainSub = oMain + ';' + linterid + ";" + sessionStorage["HUserName"];
 
                 if (AllowLoadData()) {
                     if (OperationType == 3) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html"
index 98b8112..49a9aff 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillEdit.html"
@@ -173,7 +173,7 @@
                 data.field.HItemID = linterid == "" ? 0 : linterid;
 
                 var oMain = JSON.stringify(data.field)
-                var sMainSub = oMain + ';' + linterid;
+                var sMainSub = oMain + ';' + linterid + ";" + sessionStorage["HUserName"];
 
                 $.ajax(
                     {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
index 8834399..97834de 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_DuSubsidyItemBillList.html"
@@ -181,7 +181,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_DuSubsidyItemBill/Gy_DuSubsidyItemlist',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -263,7 +263,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Gy_DuSubsidyItemBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html"
index 4b6ddfe..7dbdec0 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillEdit.html"
@@ -125,7 +125,7 @@
                 data.field.HItemID = linterid == "" ? 0 : linterid;
 
                 var oMain = JSON.stringify(data.field)
-                var sMainSub = oMain + ';' + linterid ;
+                var sMainSub = oMain + ';' + linterid + ";" + sessionStorage["HUserName"];
 
                 $.ajax(
                     {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
index 00ef632..8a8d738 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkPayTypeBillList.html"
@@ -165,7 +165,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_WorkPayTypeBill/GetWorkPayTypelist',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -247,7 +247,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Gy_WorkPayTypeBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html"
index 794caca..92d3538 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillEdit.html"
@@ -152,7 +152,7 @@
                 data.field.HItemID = linterid == "" ? 0 : linterid;
 
                 var oMain = JSON.stringify(data.field)
-                var sMainSub = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+                var sMainSub = oMain + ';' + user + ';' + ModRightNameAdd;
 
                 $.ajax(
                     {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html"
index ca0799d..0714a3e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_WorkTypeBillList.html"
@@ -180,7 +180,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_WorkTypeBill/GetWorkTypelist',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -262,7 +262,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Gy_WorkTypeBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index 5d1cf54..0f886f0 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -200,7 +200,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Pay_SingleBalBill/GetSingleBalBill',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -280,7 +280,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Pay_SingleBalBill/DeltetSingleBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index b6a92e2..d100515 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -200,7 +200,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Pay_OtherBalBill/GetOtherBalBill',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -280,7 +280,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Pay_OtherBalBill/DeltetOtherBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
index fde5051..552895e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillEdit.html"
@@ -1189,7 +1189,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index fee00a5..cdac46b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -200,7 +200,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Pay_GroupBalBill/GetGroupBalBill',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -280,7 +280,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Pay_GroupBalBill/DeltetGroupBalBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
index 0b143a4..e1c4569 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillEdit.html"
@@ -202,7 +202,7 @@
                             type: "POST",
                             url: GetWEBURL() + "/Gy_ClassTimePrj/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                             async: true,
-                            data: { "oMain": oMain },
+                            data: { "oMain": sMainSub},
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
index 0fdaf90..d264878 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjBillList.html"
@@ -228,7 +228,7 @@
             $.ajax({
                 url: GetWEBURL() + '/Gy_ClassTimePrj/list',
                 type: "GET",
-                data: { "sWhere": sWhere },
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -271,7 +271,7 @@
 
             //鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
+                var ModRightNameDelete = 'Gy_ClassTimePrj_Delete'
                 if (TagId != "") {
                     layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
                         btn: ['纭畾', '鍙栨秷'] //鎸夐挳
@@ -363,7 +363,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_ClassTimePrj/list',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
index 9802106..ce0f237 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillEdit.html"
@@ -288,7 +288,7 @@
             function set_SaveBill(data) {
                 //var sMainStr = JSON.stringify(data.field);
 
-                var sMainStr = JSON.stringify(data.field);
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "Gy_ClassTimePrjSub/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
index 8e22a8a..8a6ee46 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\240\270\347\256\227\346\226\271\345\274\217/Gy_ClassTimePrjSubBillList.html"
@@ -178,7 +178,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_ClassTimePrjSub/list',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -268,7 +268,7 @@
                         $.ajax({
                             url: GetWEBURL() + 'DeltetGy_ClassTimePrjSub',
                             type: "GET",
-                            data: { "HItemID": ItemID },
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
index 3546d12..f3dcf08 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\347\217\255\347\273\204\350\201\214\345\221\230\346\270\205\345\215\225/Gy_GroupEmpBillList.html"
@@ -158,7 +158,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_GroupEmpBill/GetGroupEmpBill',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -238,7 +238,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Gy_GroupEmpBill/DeltetGroupEmpBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index c8104b6..ec3ef9a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -182,7 +182,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Pay_WorkTimesBill/GetWorkTimesBill',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -262,7 +262,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Pay_WorkTimesBill/DeltetWorkTimesBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index d3f1bb2..c701740 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -732,7 +732,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                 var index = layer.load();
 
                 $.ajax({
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
index 7ac4539..b2a401d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillList.html"
@@ -325,7 +325,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -428,7 +428,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/MouldDeleteBill'
                             , type: "GET"
-                            , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete }
+                            , data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]}
                             , success: function (result) {
 
                                 if (result.count == 1) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 4c72738..6b231e4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -770,7 +770,7 @@
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 //瀵规暟鎹繘琛岄獙璇�
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
index 7e6399d..1e914d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
@@ -273,7 +273,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -354,7 +354,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
index 9820e8e..a573253 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldConkBookBillList.html"
@@ -456,7 +456,7 @@
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 //瀵规暟鎹繘琛岄獙璇�
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
index c7256d0..8852d17 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.html"
@@ -246,7 +246,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -350,7 +350,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index d1df417..b1206a1 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -389,6 +389,7 @@
                 $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
                 $("#btnSearch").click();
                 sWhere = "";
+                get_Display(sWhere);
             }
 
             //鏂板
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
index 1b84c46..3b399ae 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldRepairCheckBillList.html"
@@ -249,7 +249,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -329,7 +329,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
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_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_ProductReportStepBillList.html"
index 1a5d13f..58ad7b0 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_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_ProductReportStepBillList.html"
@@ -204,8 +204,72 @@
                         , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                         , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                         , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
-                        , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
-                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200}
+                        , {
+                            field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3714") {
+                                    return "宸ュ簭姹囨姤鍗�";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
                         , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
                         , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
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_ProductReportStepBillList_Web.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_ProductReportStepBillList_Web.html"
index d7f6fd9..fbc0f91 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_ProductReportStepBillList_Web.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_ProductReportStepBillList_Web.html"
@@ -235,8 +235,73 @@
                         , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200 }
-                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200 }
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3714")
+                                {
+                                    return "宸ュ簭姹囨姤鍗�";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 200 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
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 5fbacd9..1fb7470 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"
@@ -596,7 +596,7 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3702' },
+                    data: { "HBillType": '3789' },
                     success: function (d) {
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HInterID").val(0);
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_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_MESStopStepWorkBillList.html"
index 24fed30..826e196 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_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_MESStopStepWorkBillList.html"
@@ -230,8 +230,72 @@
                         , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
-                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3789") {
+                                    return "鍋滃伐鍗�";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
                         , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
                         , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
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_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_MESEndStepWorkBillList.html"
index a97213e..b233ecf 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_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_MESEndStepWorkBillList.html"
@@ -250,8 +250,72 @@
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3788") {
+                                    return "瀹屽伐鍗�";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 115 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 115 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
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_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_MESBeginStepWorkBillList.html"
index 1de5b21..04c53cf 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_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_MESBeginStepWorkBillList.html"
@@ -259,8 +259,72 @@
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , {
+                            field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, templet: function (d) {
+                                if (d.鍗曟嵁绫诲瀷 == "3787") {
+                                    return "寮�鐝崟";
+                                }
+                            }
+                        }
+                        , {
+                            field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160, templet: function (d) {
+                                switch (d.HBillStatus) {
+                                    case 0:
+                                        return "鍒涘缓"
+                                        break;
+                                    case 1:
+                                        return "鏈"
+                                        break;
+                                    case 2:
+                                        return "宸插"
+                                        break;
+                                    case 3:
+                                        return "鍏抽棴"
+                                        break;
+                                    case 4:
+                                        return "浣滃簾"
+                                        break;
+                                    case 5:
+                                        return "瀹℃牳閫�鍥�"
+                                        break;
+                                    case 6:
+                                        return "瀹℃牳涓�"
+                                        break;
+                                    case 7:
+                                        return "宸查槄"
+                                        break;
+                                    case 8:
+                                        return "宸插洖澶�"
+                                        break;
+                                    case 9:
+                                        return "缁撴"
+                                        break;
+                                    case 10:
+                                        return "楠岃瘉"
+                                        break;
+                                    case 11:
+                                        return "涓嬭揪"
+                                        break;
+                                    case 12:
+                                        return "寮�宸�"
+                                        break;
+                                    case 13:
+                                        return "鐢宠瀹℃壒"
+                                        break;
+                                    case 15:
+                                        return "鐢宠妫�楠�"
+                                        break;
+                                    case 16:
+                                        return "鍒ゅ畾鍚堟牸"
+                                        break;
+                                    case 17:
+                                        return "鍒ゅ畾涓嶅悎鏍�"
+                                        break;
+                                    default:
+                                        return d.HBillStatus
+                                }
+                            }
+                        }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
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 be3242c..568de70 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"
@@ -314,7 +314,7 @@
                                     <div class="layui-tab layui-tab-card" style="margin:10px auto;">
                                         <ul class="layui-tab-title">
                                             <li class="layui-this">閰嶆枡璁板綍</li>
-                                            <li>娌诲叿璁板綍</li>
+                                            <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">娌诲叿璁板綍</li>
                                         </ul>
                                         <div class="layui-tab-content" style="height:350px;">
                                             <div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
index c206dd0..6b78e0e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpConkBookBillList.html"
@@ -725,7 +725,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index b1a574c..c46dcb6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -590,7 +590,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 //瀵规暟鎹繘琛岄獙璇�
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 9a51e11..84a45b2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -404,7 +404,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index df6edec..64cf4da 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -246,7 +246,7 @@
                                 $.ajax({
                                     type: "GET",
                                     url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -279,7 +279,7 @@
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
                 type: "GET",
-                data: { "sWhere": sWhere},
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
@@ -322,7 +322,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpConkBookBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index 78bf939..51f6f01 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -249,7 +249,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -331,7 +331,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID },
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
index 7c2248b..e9f5dc7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
@@ -235,7 +235,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairCheckWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -286,7 +286,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 6651301..ca8010d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -415,7 +415,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index b58571e..fcb8320 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -225,7 +225,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EquipDotCheckBill/GetEquipDotCheckBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -302,7 +302,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index 362c270..a4175d4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -235,7 +235,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax({
                             type: "POST",
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 509f569..ec88bba 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -180,7 +180,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -343,7 +343,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index ad74254..29e791d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -514,7 +514,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index d64cb79..42515eb 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -351,7 +351,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -429,7 +429,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 993e866..43a571f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -318,7 +318,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 7341403..28dc26b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -344,7 +344,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -396,7 +396,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 9e6562b..128a16d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -219,7 +219,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Gy_EquipFileMain/GetList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -315,7 +315,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + '/Gy_EquipFileMain/Delete_EquipFile',
-                            data: { "HItemID": HInterID},
+                            data: { "HItemID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
index 9e0cd26..4db1db9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillEdit.html"
@@ -544,7 +544,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
                 var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                 var index = layer.load();
 
                 $.ajax({
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillList.html"
index 980cac5..725e900 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sb_EquipRepairSendWorkBillList.html"
@@ -109,8 +109,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                             </div>
@@ -294,7 +294,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EquipRepairSendWorkBill/GetEquipRepairSendWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count > 0) {
                             option.data = data1.data;
@@ -323,12 +323,10 @@
                         btn: ['纭畾', '鍙栨秷'] //鎸夐挳
                         , btn1: function () {
                             var HInterID = checkstatus.data[0].hmainid; //鑾峰彇缂栧彿
-                            var ModRightNameDelete = ""; //鍒犻櫎鏉冮檺
-
                             $.ajax({
                                 url: GetWEBURL() + '/Sb_EquipRepairSendWorkBill/DeleteWorkBill'
                                 , type: "GET"
-                                , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete}
+                                , data: { "HInterID": HInterID, "User": sessionStorage["HUserName"]}
                                 , success: function (result) {
                                     if (result.count == 1) {
                                         layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index fc3b41c..de33998 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -484,7 +484,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                 if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
index ca4ade6..e7f6259 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
@@ -205,7 +205,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -311,7 +311,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/DeleteEquipDotCheckRuleBillList',
-                            data: { "HInterID": HInterID},
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index cfcfce6..283a9d9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -253,7 +253,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
index b192038..faa4fae 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
@@ -335,7 +335,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainRuleBill/GetEquipMaintainRuleList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -415,7 +415,7 @@
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "/Sb_EquipMaintainRuleBill/DeleteEquipMaintainRuleBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": HInterID },
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

--
Gitblit v1.9.1