From b92d5211f90e8aac7b681613e4ddca75ac334c80 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期五, 05 十一月 2021 09:23:00 +0800 Subject: [PATCH] 合并 --- WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) 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 0be451b..012e23f 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" @@ -192,8 +192,8 @@ var option = [];//淇濆吇 var option1 = [];//閰嶄欢 var sBillType = "3901"; - var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇 - var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢 + //var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇 + //var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢 //#endregion //#region 杩涘叆椤甸潰鍗冲姞杞� @@ -224,7 +224,7 @@ var checkStatus = table.checkStatus('mainTable') , data = checkStatus.data;; var AddRow = table.cache['mainTable']; - var NewRow = TabRow; + var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }; switch (obj.event) { //鏂板涓�琛� case 'btn-AddLine': btnAddLine(NewRow); @@ -238,7 +238,7 @@ table.on('toolbar(mainTable1)', function (obj) { var checkStatus = table.checkStatus('mainTable1') , data = checkStatus.data; - var NewRow = TabRow1; + var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }; switch (obj.event) { //鏂板涓�琛� case 'btn-AddLine1': btnAddLine1(NewRow); @@ -466,8 +466,8 @@ function set_AddFNew() { //鑾峰彇鏈�澶у崟鎹彿 get_MAXNum(); - option.data = [TabRow]; - option1.data = [TabRow1]; + option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }]; + option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }]; table.render(option); table.render(option1); } @@ -495,9 +495,9 @@ function set_EditFromGrid(linterid) { set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋 - option.data = [TabRow]; + option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }]; table.render(option); - option1.data = [TabRow1]; + option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }]; table.render(option1); } //缂栬緫鑾峰彇琛ㄥご -- Gitblit v1.9.1