From 5867720d058e383197cd9a124a6ae977c676a06e Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期五, 04 十月 2024 10:10:55 +0800
Subject: [PATCH] 11
---
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 6
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 8
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 127 +
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 985 ++++++++
WebTM/views/基础资料/公用基础资料/Gy_CheckNoteItem.html | 15
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 12
WebTM/views/质量管理/质量报表/QC_SkillExamMonthSumReport.html | 19
WebTM/views/基础资料/生产基础资料/Gy_PostSkill_Excel.html | 233 +
WebTM/views/PublicPage/SupplierInformation.html | 2
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 15
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 12
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_ProcMul.html | 340 ++
WebTM/views/质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html | 20
WebTM/views/home/console_pb.html | 75
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 14
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 72
WebTM/views/基础资料/工资基础资料/Gy_WorkTypeList.html | 15
WebTM/views/基础资料/生产基础资料/Gy_DisposeWay_Excel.html | 230 +
WebTM/views/基础资料/生产基础资料/Gy_DisposeWayList.html | 14
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBillList.html | 165 +
WebTM/layuiadmin/modules/common.js | 23
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeUseBillList.html | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_Gy_StockPlaceList.aspx | 17
WebTM/layuiadmin/PageTitle.js | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 57
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 20
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 34
WebTM/views/基础资料/公用基础资料/Gy_CheckNoteItem_Excel.html | 230 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 5
WebTM/views/系统管理/日志管理/Xt_SystemLogList.html | 1
WebTM/views/基础资料/生产基础资料/Gy_Post_Excel.html | 230 +
WebTM/views/index_pb.html | 2
WebTM/WebTM.csproj | 22
WebTM/views/基础资料/公用基础资料/excel/Gy_CheckItem_Excel.html | 20
WebTM/App_Data/MssqlReportData.cs | 1
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 30
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 2
WebTM/views/基础资料/工资基础资料/Gy_WorkType_Excel.html | 234 +
WebTM/views/基础资料/生产基础资料/Gy_ProcMul.html | 969 ++++++++
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 2
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillEdit.html | 211 +
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBinding.html | 36
WebTM/views/grf/流转卡JSON.grf | 662 +++++
WebTM/views/基础资料/生产基础资料/Gy_Post.html | 16
WebTM/views/user/login_pda.html | 23
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 4
WebTM/views/基础资料/公用基础资料/excel/Gy_QCCheckClass_Excel.html | 15
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBillCheckQuery.html | 985 ++++++++
WebTM/views/车间管理/防错验证/Gy_MaterPreventErrMouldBillList.html | 2
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 25
WebTM/views/index.html | 1
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 7
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 4
WebTM/views/模治具管理/器具报表/Sc_MoldMainoverdueWarnReport.html | 295 ++
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 8
WebTM/views/PublicPage/PowerInformation.html | 16
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 132
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillEdit.html | 146 +
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 18
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 285 -
60 files changed, 6,719 insertions(+), 456 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index f7325a6..1900127 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -31,6 +31,7 @@
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鍑礉濂堢壒
//public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鐟炵惇
//public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔濊彵鐢垫満
+ //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娣诲悍绉戞妧
//public string sServer;
//public string sDataBase;
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2adc742..32d591d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -335,6 +335,7 @@
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInvBalList.html" />
<Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
+ <Content Include="views\鍏叡椤甸潰\Kf_SourceBillEditDlg_PDA.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Emp.html" />
@@ -347,16 +348,19 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Customer_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Department_excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_Warehouse_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\SumAdd_Gy_RestDay.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_RestDay.html" />
@@ -389,9 +393,16 @@
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Repair_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_Maintain_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheck_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkType_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ProcMul.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWay_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ProcMul.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_PostSkill_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Post_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Process_Excel.html" />
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
@@ -450,6 +461,7 @@
<Content Include="views\绯荤粺绠＄悊\澶氱骇瀹℃壒\瀹℃壒杩涘害\Xt_CheckFlowProgressList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
<Content Include="views\璁″垝绠＄悊\Excel\Gy_Group_Excel.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁惧绠＄悊\Sb_Add_EquipRepairSignBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairSignBillList_PDA.html" />
diff --git a/WebTM/layuiadmin/PageTitle.js b/WebTM/layuiadmin/PageTitle.js
index fec07c5..1f54492 100644
--- a/WebTM/layuiadmin/PageTitle.js
+++ b/WebTM/layuiadmin/PageTitle.js
@@ -5,7 +5,7 @@
$.ajax({
type: "GET",
async: false,
- url: GetWEBURL() + "Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Web/GetModuleName", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HModuleType": HModuleType },
success: function (result) {
if (result.count == 1) {
diff --git a/WebTM/layuiadmin/modules/common.js b/WebTM/layuiadmin/modules/common.js
index 9139964..4aa019e 100644
--- a/WebTM/layuiadmin/modules/common.js
+++ b/WebTM/layuiadmin/modules/common.js
@@ -38,7 +38,28 @@
});
}
});
- };
+ };
+
+ //閫�鍑�2
+ admin.events.logout2 = function () {
+ //鎵ц閫�鍑烘帴鍙�
+ admin.req({
+ url: layui.setter.base + 'json/user/logout.js'
+ , type: 'get'
+ , data: {}
+ , done: function (res) { //杩欓噷瑕佽鏄庝竴涓嬶細done 鏄彧鏈� response 鐨� code 姝ｅ父鎵嶄細鎵ц銆傝�� succese 鍒欐槸鍙 http 涓� 200 灏变細鎵ц
+
+ //娓呯┖鏈湴璁板綍鐨� token锛屽苟璺宠浆鍒扮櫥鍏ラ〉
+ admin.exit(function () {
+ //location.href = 'user/login.html';
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.href = 'user/login_pb.html';
+ });
+ });
+ }
+ });
+ };
+
//瀵瑰鏆撮湶鐨勬帴鍙�
diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index 67f2c70..774a2b5 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -75,6 +75,8 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細linterid 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+ linterid = getParams("linterid");
}
var treeCkData = { id: 0 };
@@ -348,7 +350,19 @@
}
})
return treeData;
- }
+ }
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
</script>
</body>
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index ccc43ca..544d4f1 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -203,7 +203,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
new file mode 100644
index 0000000..6139831
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241JSON.grf"
@@ -0,0 +1,662 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":11,
+ "Width":14.8,
+ "Height":21,
+ "Oriention":"Landscape",
+ "LeftMargin":1.5,
+ "TopMargin":1.5,
+ "RightMargin":1.5,
+ "BottomMargin":1.5
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy/MM/dd"
+ },
+ {
+ "Name":"鐢熶骇璁㈠崟鍙�"
+ },
+ {
+ "Name":"娲惧伐鍗曞彿"
+ },
+ {
+ "Name":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Name":"浜у搧浠ｇ爜"
+ },
+ {
+ "Name":"浜у搧鍚嶇О"
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿"
+ },
+ {
+ "Name":"娴佽浆鍗℃暟閲�"
+ },
+ {
+ "Name":"鍗℃暟閲�"
+ },
+ {
+ "Name":"鎵瑰彿"
+ },
+ {
+ "Name":"娴佹按鍙�"
+ },
+ {
+ "Name":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Name":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Name":"鐝粍"
+ },
+ {
+ "Name":"鏈哄彴"
+ },
+ {
+ "Name":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Name":"宸ュ簭璇存槑"
+ },
+ {
+ "Name":"鐝彿"
+ },
+ {
+ "Name":"宸ユ鍚嶇О"
+ },
+ {
+ "Name":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Name":"宸ヨ壓宸ヨ壓鍙傛暟"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column14",
+ "Width":1.16417
+ },
+ {
+ "Name":"Column1",
+ "Width":2.01083
+ },
+ {
+ "Name":"Column2",
+ "Width":2.40771
+ },
+ {
+ "Name":"Column16",
+ "Width":2.19604
+ },
+ {
+ "Name":"Column3",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column8",
+ "Width":2.59292
+ },
+ {
+ "Name":"Column9",
+ "Width":1.19063
+ },
+ {
+ "Name":"Column12",
+ "Width":3.22792
+ },
+ {
+ "Name":"Column15",
+ "Width":1.98438
+ }
+ ],
+ "ColumnContent":{
+ "Height":1.19063,
+ "AdjustRowHeight":false,
+ "RowsPerPage":6,
+ "ColumnContentCell":[
+ {
+ "Column":"Column14",
+ "FreeCell":true,
+ "Control":[
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox3",
+ "Left":0.5,
+ "Top":-0.8,
+ "Width":1.5875,
+ "Height":0.608542,
+ "SystemVar":"RowNo"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox14",
+ "Dock":"Fill",
+ "DataField":"娴佹按鍙�"
+ }
+ ]
+ },
+ {
+ "Column":"Column1",
+ "DataField":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "Column":"Column2",
+ "CanGrow":true,
+ "CanShrink":true,
+ "ShrinkFontToFit":true,
+ "DataField":"宸ュ簭鍚嶇О"
+ },
+ {
+ "Column":"Column16",
+ "DataField":"宸ユ鍚嶇О"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"鐝粍"
+ },
+ {
+ "Column":"Column8",
+ "WordWrap":true,
+ "DataField":"宸ヨ壓宸ヤ綔涓績"
+ },
+ {
+ "Column":"Column9",
+ "WordWrap":true,
+ "ShrinkFontToFit":true,
+ "DataField":"瀹炰綔鏁伴噺"
+ },
+ {
+ "Column":"Column12",
+ "DataField":"宸ヨ壓宸ヨ壓鍙傛暟"
+ },
+ {
+ "Column":"Column15",
+ "DataField":"鐝彿"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":1.19063,
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column14",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍙�"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭浠ｇ爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column16",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ユ鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝粍"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column8",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鏈哄彴"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column9",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"瀹炰綔鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column12",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"宸ュ簭璇存槑"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column15",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鐝彿"
+ }
+ ]
+ }
+ },
+ "Parameter":[
+ {
+ "Name":"椤电爜"
+ }
+ ],
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "CanGrow":true,
+ "CanShrink":true,
+ "Height":4.60375,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Control":[
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Center":"Horizontal",
+ "Left":7.96396,
+ "Width":2.06375,
+ "Height":0.687917,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":180000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"娴佽浆鍗�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":10.6098,
+ "Top":2.19604,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":4.39208,
+ "Top":1.00542,
+ "Width":2.98979,
+ "Height":0.608542,
+ "TextAlign":"MiddleCenter",
+ "Text":"QC妫�鏌ユ柟寮忥細"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":5.3975,
+ "Top":2.19604,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Text":"鏃ユ湡锛�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":12.1973,
+ "Top":2.19604,
+ "Width":3.99521,
+ "Height":0.608542,
+ "DataField":"鐢熶骇杞﹂棿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":6.40292,
+ "Top":2.19604,
+ "Width":3.78354,
+ "Height":0.608542,
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox1",
+ "Left":15.6104,
+ "Top":1.40229,
+ "Width":1.79917,
+ "Height":0.423333,
+ "Format":"鍏�0椤�",
+ "SystemVar":"PageCount"
+ },
+ {
+ "Type":"SystemVarBox",
+ "Name":"SystemVarBox2",
+ "Left":14.3933,
+ "Top":1.40229,
+ "Width":1.21708,
+ "Height":0.423333,
+ "Format":"绗�0椤�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox18",
+ "Left":0.211667,
+ "Top":2.98979,
+ "Width":2.61938,
+ "Height":0.608542,
+ "Text":"浜у搧浠ｇ爜锛�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox19",
+ "Left":0.211667,
+ "Top":2.19604,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"娲惧伐鍗�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox9",
+ "Left":1.5875,
+ "Top":2.19604,
+ "Width":3.20146,
+ "Height":0.582083,
+ "DataField":"娲惧伐鍗曞彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox10",
+ "Left":1.79917,
+ "Top":2.98979,
+ "Width":2.80458,
+ "Height":0.608542,
+ "DataField":"浜у搧浠ｇ爜"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox21",
+ "Left":10.6098,
+ "Top":3.81,
+ "Width":2.80458,
+ "Height":0.582083,
+ "Text":"鎵规锛�"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":12.2502,
+ "Top":0.899583,
+ "Width":1.98438,
+ "Height":1.21708,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "CaptionAlignment":"Far",
+ "CheckSum":true,
+ "Text":"[#鍗曟嵁鍙�#]"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox11",
+ "Left":11.8004,
+ "Top":3.81,
+ "Width":4.60375,
+ "Height":0.582083,
+ "DataField":"鎵瑰彿"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode2",
+ "Left":0.211667,
+ "Top":0.608542,
+ "Width":2.59292,
+ "Height":1.40229,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":12.0121,
+ "Top":0.211667,
+ "Width":1.79917,
+ "Height":0.582083,
+ "Text":"娴佽浆鍗″彿"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox13",
+ "Left":13.8113,
+ "Top":0.211667,
+ "Width":4.20688,
+ "Height":0.582083,
+ "DataField":"鍗曟嵁鍙�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox24",
+ "Left":0.211667,
+ "Width":5.79438,
+ "Height":0.582083,
+ "Text":"浠诲姟鍗曞彿锛歔#鐢熶骇璁㈠崟鍙�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox25",
+ "Left":7.19667,
+ "Top":1.00542,
+ "Width":1.19063,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox1",
+ "Left":8.38729,
+ "Top":1.00542,
+ "Width":0.608542,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox26",
+ "Left":9.2075,
+ "Top":1.00542,
+ "Width":1.40229,
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "Text":"鎶芥"
+ },
+ {
+ "Type":"ShapeBox",
+ "Name":"ShapeBox2",
+ "Left":10.2129,
+ "Top":1.00542,
+ "Width":0.79375,
+ "Height":0.582083
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox27",
+ "Left":5.3975,
+ "Top":2.98979,
+ "Width":4.60375,
+ "Height":0.608542,
+ "Text":"浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox28",
+ "Left":10.6098,
+ "Top":2.98979,
+ "Width":6.21771,
+ "Height":0.608542,
+ "Text":"瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox29",
+ "Left":0.211667,
+ "Top":3.81,
+ "Width":5.18583,
+ "Height":0.608542,
+ "Text":"鐢熶骇鏁伴噺锛歔#娴佽浆鍗℃暟閲�#]"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox30",
+ "Left":5.3975,
+ "Top":3.81,
+ "Width":3.99521,
+ "Height":0.608542,
+ "Text":"鍗℃暟閲忥細[#娴佽浆鍗℃暟閲�#]"
+ }
+ ],
+ "RepeatOnPage":true
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":2.01083,
+ "Control":[
+ {
+ "Type":"FreeGrid",
+ "Name":"FreeGrid1",
+ "Dock":"Left",
+ "Border":{
+ "Styles":"[DrawLeft|DrawRight|DrawBottom]"
+ },
+ "ColumnCount":7,
+ "RowCount":2,
+ "FreeGridColumn":[
+ {
+ "index":1,
+ "Width":3.175
+ },
+ {
+ "index":2,
+ "Width":2.38125
+ },
+ {
+ "index":3,
+ "Width":2.2225
+ },
+ {
+ "index":4,
+ "Width":1.16417
+ },
+ {
+ "index":5,
+ "Width":2.61938
+ },
+ {
+ "index":6,
+ "Width":1.19063
+ },
+ {
+ "index":7,
+ "Width":5.2123
+ }
+ ],
+ "FreeGridRow":[
+ ],
+ "FreeGridCell":[
+ {
+ "row":1,
+ "col":1,
+ "Text":"鍏ュ簱璁板綍"
+ },
+ {
+ "row":2,
+ "col":1,
+ "Text":"棰嗙敤璁板綍"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/WebTM/views/home/console_pb.html b/WebTM/views/home/console_pb.html
index a214ef0..5e741f0 100644
--- a/WebTM/views/home/console_pb.html
+++ b/WebTM/views/home/console_pb.html
@@ -18,69 +18,60 @@
<div class="layui-col-md6" style="width:100%;margin-left:2.8%;margin-top:2.5%;">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header">杞﹂棿蹇嵎鏂瑰紡</div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 480px;">
<div carousel-item="">
<ul class="layui-row layui-col-space10 layui-this">
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
+ <a lay-href="鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<i class="layui-icon layui-icon-add-circle"></i>
- <cite>鐢熶骇璁″垝骞冲彴</cite>
+ <cite>鐢熶骇璁㈠崟鍒楄〃</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
<i class="layui-icon layui-icon-mike"></i>
- <cite>鏃ヨ鍒掑伐鍗曞垪琛�</cite>
+ <cite>娴佽浆鍗″垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="IpadIndex.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
<i class="layui-icon layui-icon-theme"></i>
- <cite>鎶ュ伐骞冲彴</cite>
+ <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
+ <a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
<i class="layui-icon layui-icon-chart"></i>
- <cite>璁惧鐐规璁板綍鍗�</cite>
+ <cite>鍑虹珯姹囨姤鍗曞垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
+ <a lay-href="鐢熶骇绠＄悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">
<i class="layui-icon layui-icon-app"></i>
- <cite>璁惧淇濆吇璁板綍鍗�</cite>
+ <cite>鐢熶骇鐢ㄦ枡娓呭崟鍒楄〃</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
+ <a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧鏁呴殰鐧昏鍗�</cite>
+ <cite>鑰冨嫟姹囨姤鍗�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
+ <a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧缁翠慨楠屾敹鍗�</cite>
+ <cite>鑰冨嫟姹囨姤鍗曞垪琛�</cite>
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillWorkQtyStatus_TmpList.html">
+ <a lay-href="杞﹂棿绠＄悊/鍏抽敭浠剁粦瀹�/Sc_KeyElementBinding.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧浜ч噺閲囬泦鍒楄〃</cite>
- </a>
- </li>
- </ul>
- <ul class="layui-row layui-col-space10">
- <li class="layui-col-xs3">
- <a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ICMOBillQualityStatus_TmpList.html">
- <i class="layui-icon layui-icon-addition"></i>
- <cite>璁惧璐ㄩ噺閲囬泦鍒楄〃</cite>
+ <cite>鍏抽敭浠剁粦瀹�</cite>
</a>
</li>
-
- </ul>
+ </ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
@@ -88,9 +79,9 @@
</div>
</div>
<div class="layui-col-md6" style="width:100%;margin-left:2.8%;">
- <!--蹇嵎鏂瑰紡-->
+ <!--蹇嵎鏂瑰紡-->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div class="layui-card-header">浠撳簱蹇嵎鏂瑰紡</div>
<div class="layui-card-body">
<div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
<div carousel-item="">
@@ -100,8 +91,28 @@
<i class="layui-icon layui-icon-console"></i>
<cite>澶栬喘鍏ュ簱</cite>
</a>
- </li>
- </ul>-->
+ </li>
+ </ul>-->
+ <ul class="layui-row layui-col-space10">
+ <li class="layui-col-xs3">
+ <a lay-href="浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鏉＄爜鐢熸垚</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>鏉＄爜涓绘。鍒楄〃</cite>
+ </a>
+ </li>
+ <li class="layui-col-xs3">
+ <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">
+ <i class="layui-icon layui-icon-addition"></i>
+ <cite>浠撲綅鍒楄〃</cite>
+ </a>
+ </li>
+ </ul>
</div>
<div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
</div>
@@ -113,6 +124,8 @@
</div>
<script src="../../layuiadmin/layui/layui.js?t=1"></script>
+ <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+
<script>
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1cddf4a..06edaa3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -824,6 +824,7 @@
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_StockCheckItemList.html">鐩樼偣鏂规鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">鐩樼偣璁板綍琛�</a></dd>
<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">鐩樼偣鍒嗘瀽鍒楄〃</a></dd>
+ <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Sc_MoldMainoverdueWarnReport.html">妯″叿淇濆吇閫炬湡棰勮鎶ヨ〃</a></dd>
</dl>
</dd>
</dl>
diff --git a/WebTM/views/index_pb.html b/WebTM/views/index_pb.html
index 06e054a..bbee727 100644
--- a/WebTM/views/index_pb.html
+++ b/WebTM/views/index_pb.html
@@ -89,7 +89,7 @@
<dl class="layui-nav-child">
<!--<dd><a lay-href="set/user/info.html">鍩烘湰璧勬枡</a></dd>-->
<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>
- <dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
+ <dd layadmin-event="logout2" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
diff --git a/WebTM/views/user/login_pda.html b/WebTM/views/user/login_pda.html
index 12ebb86..05e7763 100644
--- a/WebTM/views/user/login_pda.html
+++ b/WebTM/views/user/login_pda.html
@@ -15,6 +15,12 @@
.layadmin-user-login-body .layui-form-item .layui-input {
color: blue;
}
+ .layui-form-checked i, .layui-form-checked:hover i {
+ color: #009688 !important;
+ }
+ .layui-form-checked span, .layui-form-checked:hover span {
+ background-color: #009688 !important;
+ }
</style>
</head>
<body>
@@ -46,6 +52,9 @@
<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
<!--<button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-yp" name="LAY-user-login-yp" lay-filter="LAY-user-login-yp">闊抽</button>-->
+ </div>
+ <div class="layui-form">
+ <input type="checkbox" name="SavePassWord" title="鏄惁淇濆瓨瀵嗙爜" lay-skin="tag" id="SavePassWord" checked>
</div>
</div>
</div>
@@ -174,6 +183,12 @@
if (data != null) {
var data2 = JSON.parse(data);
$("#LAY-user-login-username").val(data2["UserID"]);
+ $("#LAY-user-login-password").val(data2["UserPassword"]);
+
+ $("#SavePassWord").prop('checked', data2["SavePassWord"] == "false"?false: true);
+ if (data2["SavePassWord"]=="false") {
+ $(".layui-form-checkbox").removeClass("layui-form-checked")
+ }
$("#Organization").val(data2["OrgID"]);
form.render('select');
}
@@ -186,6 +201,8 @@
var data = {
UserID: sessionStorage["Czybm"]
, OrgID: sessionStorage["OrganizationID"]
+ , SavePassWord: sessionStorage["SavePassWord"]
+ , UserPassword: sessionStorage["HUserPassword"]
}
//鏈湴瀛樺偍
localStorage.setItem("data", JSON.stringify(data));
@@ -210,6 +227,12 @@
data: { "HUserNumber": UserName, "HPassWord": PassWord, "HStockOrgID": HStockOrgID, "HStockOrgName": HStockOrgName },
success: function (result) {
if (result.count == 1) {
+ sessionStorage["SavePassWord"] = $("#SavePassWord").is(':checked');
+ if ($("#SavePassWord").is(':checked')) {
+ sessionStorage["HUserPassword"] = PassWord;
+ } else {
+ sessionStorage["HUserPassword"] = "";
+ }
sessionStorage["HUserName"] = result.data[0].Czymc;
sessionStorage["HBillerID"] = result.data[0].HK3UserID;
sessionStorage["Czmm"] = result.data[0].Czmm;
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_CheckNoteItem.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_CheckNoteItem.html"
index d7c194a..058587b 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_CheckNoteItem.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_CheckNoteItem.html"
@@ -140,6 +140,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -221,6 +222,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -518,6 +522,17 @@
$("#btnSearch").trigger('click');
}
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍚姩妫�鏌ラ」鐩鍏�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_CheckNoteItem_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Gy_CheckNoteItem_ExportExcel";
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_CheckNoteItem_Excel.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_CheckNoteItem_Excel.html"
new file mode 100644
index 0000000..564be35
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckNoteItem_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鍚姩妫�鏌ラ」鐩鍏�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_CheckNoteItem/Gy_CheckNoteItem_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '鍚姩妫�鏌ラ」鐩悕绉�', title: '鍚姩妫�鏌ラ」鐩悕绉�', width: 120 }
+ , { field: '鍚姩妫�鏌ラ」鐩唬鐮�', title: '鍚姩妫�鏌ラ」鐩唬鐮�', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_CheckNoteItem/Gy_CheckNoteItem_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.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_QCCheckClass.html"
index ed5960f..0ec30c7 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_QCCheckClass.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_QCCheckClass.html"
@@ -357,7 +357,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '鐢熶骇鐝粍瀵煎叆'
+ , title: '妫�楠岄」鐩垎绫诲鍏�'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_QCCheckClass_Excel.html?OperationType=dao&HSouceBillType='
})
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/excel/Gy_CheckItem_Excel.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/excel/Gy_CheckItem_Excel.html"
index 5d76e39..ebfc1c1 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/excel/Gy_CheckItem_Excel.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/excel/Gy_CheckItem_Excel.html"
@@ -85,7 +85,7 @@
//鏂囦欢涓婁紶
upload.render({
elem: '#UpLoad',
- url: GetWEBURL() + '/Gy_CheckItem/Gy_Process_Excel',
+ url: GetWEBURL() + '/Gy_CheckItem/Gy_CheckItem_Excel',
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
done: function (data1) {
@@ -148,12 +148,16 @@
, loading: false
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '浠ｇ爜', title: '浠ｇ爜' }
- , { field: '鍚嶇О', title: '鍚嶇О' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '妫�楠岄」鐩被鍒唬鐮�', title: '妫�楠岄」鐩被鍒唬鐮�', hide: true }
- , { field: '妫�楠岄」鐩被鍒悕绉�', title: '妫�楠岄」鐩被鍒悕绉�' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�', width: 120 }
+ , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', width: 120 }
+ , { field: 'HQCCheckClassID', title: 'HQCCheckClassID', width: 120, hide: true }
+ , { field: '妫�楠岄」鐩垎绫讳唬鐮�', title: '妫�楠岄」鐩垎绫讳唬鐮�', width: 120 }
+ , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
};
@@ -198,7 +202,7 @@
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Gy_CheckItem/Gy_Process_btnSave",
+ url: GetWEBURL() + "/Gy_CheckItem/Gy_CheckItem_btnSave",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
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/excel/Gy_QCCheckClass_Excel.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/excel/Gy_QCCheckClass_Excel.html"
index bd0cfea..3f8099f 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/excel/Gy_QCCheckClass_Excel.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/excel/Gy_QCCheckClass_Excel.html"
@@ -85,7 +85,7 @@
//鏂囦欢涓婁紶
upload.render({
elem: '#UpLoad',
- url: GetWEBURL() + '/Gy_QCCheckClass/Gy_Process_Excel',
+ url: GetWEBURL() + '/Gy_QCCheckClass/Gy_QCCheckClass_Excel',
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
done: function (data1) {
@@ -148,10 +148,13 @@
, loading: false
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '浠ｇ爜', title: '浠ｇ爜' }
- , { field: '鍚嶇О', title: '鍚嶇О' }
- , { field: '澶囨敞', title: '澶囨敞' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '妫�楠岄」鐩垎绫讳唬鐮�', title: '妫�楠岄」鐩垎绫讳唬鐮�', width: 120 }
+ , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
};
@@ -196,7 +199,7 @@
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Gy_QCCheckClass/Gy_Process_btnSave",
+ url: GetWEBURL() + "/Gy_QCCheckClass/Gy_QCCheckClass_btnSave",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx"
index d12ecb6..3d2b490 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/xmlLBM_Gy_StockPlaceList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Gy_StockPlaceList.aspx"
@@ -1,4 +1,4 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList" %>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Gy_StockPlaceList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Gy_StockPlaceList4" %>
<!DOCTYPE html>
@@ -7,14 +7,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<script runat="server">
- protected void Page_Load(object sender, EventArgs e)
- {
- //鈽呯壒鍒彁绀衡槄锛�
- //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
- //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
- SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")");
- }
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Gy_StockPlaceList where HItemID in(" + Request.Params["linterid"] + ")","select 1");
+ }
</script>
</head>
<body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
index b8337a9..2244de3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeList.html"
@@ -105,6 +105,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Modify" id="btn_Modify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Check" id="btn_Check"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AbandonCheck" id="btn_AbandonCheck"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Stop" id="btn_Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -416,6 +417,9 @@
//鍒锋柊鎸夐挳
case 'btn_Refresh': btn_Refresh();
break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
//瀹℃牳鎸夐挳
case 'btn_Check': set_CheckBill(0);
break;
@@ -544,6 +548,17 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ョ瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_WorkType_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
//#region 鍒锋柊
function btn_Refresh() {
set_ClearQuery();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType_Excel.html"
new file mode 100644
index 0000000..6b23ff4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType_Excel.html"
@@ -0,0 +1,234 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ョ瀵煎叆</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_WorkTypeController/Gy_WorkTypeController_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '宸ョ浠ｇ爜', title: '宸ョ浠ｇ爜', width: 120 }
+ , { field: '宸ョ鍚嶇О', title: '宸ョ鍚嶇О', width: 120 }
+ , { field: '鏃ュ伐璧�', title: '鏃ュ伐璧�', width: 120 }
+ , { field: '灏忔椂宸ヨ祫', title: '灏忔椂宸ヨ祫', width: 120 }
+ , { field: '鑰冭檻浜烘暟', title: '鑰冭檻浜烘暟', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_WorkTypeController/Gy_WorkTypeController_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ProcMul.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ProcMul.html"
new file mode 100644
index 0000000..12bcac4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ProcMul.html"
@@ -0,0 +1,340 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏂板/缂栬緫宸ユ</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+
+ <h1 style="text-align:center;"><b>宸ユ</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ </select>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-xs11">
+ <label class="layui-form-label"> 澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //#endregion
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid();
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "Gy_ProcMul/SaveGy_ProcMulList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+ //#endregion
+
+
+ //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+ //#region 閫夋嫨寮圭獥浜嬩欢
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ get_checkDept();
+ });
+ //#endregion
+
+ //#region 寮圭獥閫夋嫨鏂规硶
+ //#region 閫夋嫨閮ㄩ棬
+ function get_checkDept() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#endregion
+
+ //#endregion
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Organ();
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ $("#HItemID").val("0");
+ $("#HNumber").val("");
+ }
+ //缂栬緫
+ function set_EditFromGrid() {
+ $("#HItemID").val(linterid);
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ }
+ //缂栬緫鍔犺浇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Gy_ProcMul/GetGy_ProcMulDetail",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ $("#HItemID").val(data.HItemID);//浠ｇ爜ID
+ $("#HNumber").val(data.宸ユ浠ｇ爜);//浠ｇ爜
+ $("#HName").val(data.宸ユ鍚嶇О);//鍚嶇О
+ $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+ $("#HDeptID").val(data.HDeptID);//閮ㄩ棬id
+ $("#HDeptName").val(data.鎵�灞為儴闂�);//閮ㄩ棬
+ $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HUseFlag ").val(data.浣跨敤鏍囪);//浣跨敤鐘舵��
+ $("#HRemark").val(data.澶囨敞);//澶囨敞
+ $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪 == "Y" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ //
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ function Organ() {
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+ });
+ //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁 琛ㄥご
+ function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 0925311..812c87e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -83,7 +83,17 @@
<input type="checkbox" name="checkboxHTProcessFlag" id="checkboxHTProcessFlag" lay-filter="checkboxHTProcessFlag" lay-skin="primary" value="true" title="鏄惁杞伐搴�">
<input type="hidden" value="false" name="HTProcessFlag" id="HTProcessFlag">
</div>
- </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ユ</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcMulID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -124,7 +134,23 @@
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璁′欢宸ヨ祫绫诲瀷</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HPayMentType" id="HPayMentType">
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ <option value="涓汉璁′欢" selected>涓汉璁′欢</option>
+ <option value="闆嗕綋璁′欢">闆嗕綋璁′欢</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
+
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
<div class="layui-input-inline" style="margin-bottom: -15px;">
@@ -468,6 +494,11 @@
get_checkWorkCenter();
});
+ //閫夋嫨宸ユ鎸夐挳
+ form.on('submit(HProcMulID-BT)', function () {
+ get_checkProcMul();
+ });
+
//閫夋嫨鐝粍鎸夐挳
form.on('submit(ProductionTeam-BT)', function () {
get_checkGroup();
@@ -578,8 +609,8 @@
, "HName": data.宸ュ簭鍚嶇О
, "HFixPrice": data.鐝骇瀹氶
, "HLevel": data.绛夌骇
- //, "HProcMulName": data.宸ユ鍚嶇О
- //, "HProcMulID": data.宸ユID
+ , "HProcMulName": data.宸ユ鍚嶇О
+ , "HProcMulID": data.HProMulID
, "HBarCodeForBase": data.鏉″舰鐮�
, "HHelpCode": data.鍔╄鐮�
, "HDeptName": data.閮ㄩ棬
@@ -617,6 +648,7 @@
, "HQCSchemeName_Proc": data.杞簭妫�楠屾柟妗�
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
+ , "HPayMentType": data.璁′欢宸ヨ祫绫诲瀷
});
layer.close(ajaxLoad);
} else {
@@ -651,6 +683,10 @@
//}
if ($("#HWorkCenterName").val() == "") {
layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HProcMulName").val() == "") {
+ layer.msg("璇烽�夋嫨宸ユ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
//if (!$("#HProcessID_K3").val()) {
@@ -790,6 +826,31 @@
}
$("#HWorkCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
$("#HWorkCenterID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸ユ鏂规硶
+ function get_checkProcMul() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ユ鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcMulName").val(checkStatus.data[0].宸ユ鍚嶇О);
+ $("#HProcMulID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1090,6 +1151,11 @@
$("#HWHName").val(obj[0].鑹搧浠撳簱);
$("#HWHID").val(obj[0].HItemID);
}
+ //杩斿洖宸ユ
+ function GetGyProcMulValue(obj) {
+ $("#HProcMulName").val(obj[0].宸ユ鍚嶇О);
+ $("#HProcMulID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWayList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWayList.html"
index 8da5e51..c97b8bd 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWayList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWayList.html"
@@ -95,6 +95,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -155,6 +156,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
@@ -575,6 +579,16 @@
}
//#endregion
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶勭悊鏂规瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_DisposeWay_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWay_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWay_Excel.html"
new file mode 100644
index 0000000..f1ce73d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DisposeWay_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>澶勭悊鏂规瀵煎叆</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_DisposeWay/Gy_DisposeWay_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '澶勭悊鏂规', title: '澶勭悊鏂规', width: 120 }
+ , { field: '澶勭悊鏂规浠ｇ爜', title: '澶勭悊鏂规浠ｇ爜', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_DisposeWay/Gy_DisposeWay_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
index 605cdbd..b4f5e69 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
@@ -86,6 +86,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -164,6 +165,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -410,6 +414,18 @@
function get_Refresh() {
$("#btnSearch").trigger('click');
}
+
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宀椾綅瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_Post_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
index 0c96cca..009e4c8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
@@ -86,6 +86,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
@@ -164,6 +165,9 @@
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -397,7 +401,16 @@
});
//#endregion
-
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宀椾綅鎶�鑳藉鍏�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_PostSkill_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkill_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkill_Excel.html"
new file mode 100644
index 0000000..3a55912
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkill_Excel.html"
@@ -0,0 +1,233 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宀椾綅鎶�鑳藉鍏�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_PostSkill/Gy_PostSkill_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '宀椾綅鎶�鑳�', title: '宀椾綅鎶�鑳�', width: 120 }
+ , { field: '宀椾綅鎶�鑳戒唬鐮�', title: '宀椾綅鎶�鑳戒唬鐮�', width: 120 }
+ , { field: 'HPostID', title: 'HPostID', width: 120, hide: true }
+ , { field: '宀椾綅', title: '宀椾綅', width: 120 }
+ , { field: '宀椾綅浠ｇ爜', title: '宀椾綅浠ｇ爜', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_PostSkill/Gy_PostSkill_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post_Excel.html"
new file mode 100644
index 0000000..7c981e9
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post_Excel.html"
@@ -0,0 +1,230 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宀椾綅瀵煎叆</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;" >
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_Post/Gy_Post_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HOrgID', title: 'HOrgID', width: 120, hide: true }
+ , { field: '缁勭粐浠ｇ爜', title: '缁勭粐浠ｇ爜', width: 120 }
+ , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
+ , { field: '宀椾綅', title: '宀椾綅', width: 120 }
+ , { field: '宀椾綅浠ｇ爜', title: '宀椾綅浠ｇ爜', width: 120 }
+ , { field: '鍔╄鐮�', title: '鍔╄鐮�', width: 120 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_Post/Gy_Post_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcMul.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcMul.html"
new file mode 100644
index 0000000..ff8760b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcMul.html"
@@ -0,0 +1,969 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ユ鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ユ浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ユ鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_ProcMul";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐","HDeptID"];
+
+ //#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "宸ユ鍒楄〃缁存姢";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_ProcMul";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //浠ｇ爜鍥炶溅鏂规硶
+ $('#HNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ //鍚嶇О鍥炶溅鏂规硶
+ $('#HName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();
+ }
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetGyProcMulValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+
+ get_DefaultModule();
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Gy_ProcMul/Gy_ProcMulList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_ProcMul";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HNumber) {
+ sWhere += " and 宸ユ浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 宸ユ鍚嶇О like '%" + HName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ユ瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_ProcMul_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板宸ユ',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_ProcMul.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ //缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ユ'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_ProcMul.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HItemID = data[0].HItemID.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_ProcMul/DeltetGy_ProcMul", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ProcMul/AuditGy_ProcMul", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ProcMul/StopGy_ProcMul", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鏌ヨ
+ get_FastQuery();
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index 12e96ee..36887f8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -192,7 +192,7 @@
var sWhere = "";
var HModName = "Gy_Process";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID"];
+ var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID","HProcMulID"];
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillCheckQuery.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillCheckQuery.html"
new file mode 100644
index 0000000..a54f78e
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillCheckQuery.html"
@@ -0,0 +1,985 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>瀹氶鐢宠鍗曞緟瀹℃牳娓呭崟</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="">
+ <div class="layui-card-body"style="padding:1px">
+ <h1 style="text-align:center;margin-bottom:7px;margin-top:7px;"><b>瀹氶鐢宠鍗曟煡璇�</b></h1>
+ <div class="layui-tab layui-tab-card" lay-filter="table">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鎴戝垱寤虹殑</li>
+ <li>闇�瑕佹垜瀹℃牳鐨�</li>
+ <li>鎴戝凡瀹℃牳鐨�</li>
+ </ul>
+ <div class="layui-tab-content" style="">
+ <div class="layui-tab-item layui-show">
+ <script type="text/html" id="toolbarDemoSend">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableSend" lay-filter="mainTableSend"></table>
+ </div>
+ <div class="layui-tab-item ">
+ <script type="text/html" id="toolbarDemoNeedCheck">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableNeedCheck" lay-filter="mainTableNeedCheck"></table>
+ </div>
+ <div class="layui-tab-item ">
+ <script type="text/html" id="toolbarDemoChecked">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableChecked" lay-filter="mainTableChecked"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ window.HDeptType = 0;
+ var tabIndex = 1;//椤电绱㈠紩
+ var option = [];
+ var optionNeedCheck = [];
+ var optionSend = [];
+ var optionChecked = [];
+ var HBillType = 2219;
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+ //#endregion
+ //#endregion
+ var HModName = "Pay_ProcPriceRequestBillCheckQuery";
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(1);
+ //get_Display(2);
+ //get_Display(3);
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //#region澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableSend)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableSend');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(1);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableSend');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableSend');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableSend');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableSend');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableSend');
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ table.on('toolbar(mainTableNeedCheck)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(2);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableNeedCheck');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableNeedCheck');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableNeedCheck');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableNeedCheck');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableNeedCheck');
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ table.on('toolbar(mainTableChecked)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableChecked');
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableChecked');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableChecked');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableChecked');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableChecked');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableChecked');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(3);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ table.on('tool(mainTableChecked)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹氶鐢宠鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ table.on('tool(mainTableNeedCheck)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹氶鐢宠鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ table.on('tool(mainTableSend)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹氶鐢宠鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //#region 鐩戝惉Tab鍒囨崲锛屽垏鎹㈡椂瑙﹀彂
+ element.on('tab(table)', function (data) {
+ // 鑾峰彇琚垏鎹㈠埌鐨勯潰鏉跨殑绱㈠紩
+ var index = data.index;
+ // 鎵ц涓�浜涙搷浣滐紝渚嬪鏀瑰彉椤甸潰鍐呭
+ tabIndex = index + 1;
+ get_Display(index+1);
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTableChecked)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableChecked, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ table.on('row(mainTableSend)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableSend, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ table.on('row(mainTableNeedCheck)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableNeedCheck, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鎺掑簭
+ table.on('sort(mainTableChecked)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableReceive', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionNeedCheck.data = layui.table.cache["mainTableReceive"];
+ table.render(optionNeedCheck);
+ });
+ table.on('sort(mainTableSend)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableSend', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionSend.data = layui.table.cache["mainTableSend"];
+ table.render(optionSend);
+ });
+ table.on('sort(mainTableNeedCheck)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableSendCopy', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionChecked.data = layui.table.cache["mainTableSendCopy"];
+ table.render(optionChecked);
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ optionNeedCheck = {
+ elem: '#mainTableNeedCheck'
+ , toolbar: '#toolbarDemoNeedCheck'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , data : []
+ };
+ optionSend = {
+ elem: '#mainTableSend'
+ , toolbar: '#toolbarDemoSend'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ };
+ optionChecked = {
+ elem: '#mainTableChecked'
+ , toolbar: '#toolbarDemoChecked'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ };
+ option = optionSend;//鍒濆鍖栧垪璁剧疆option
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄦ牸1涓烘垜鍙戣捣鐨�2鎴戦渶瑕佸鏍哥殑3鎴戝凡瀹℃牳鐨�
+ function get_Display(type) {
+ var ajaxLoad = layer.load();//閬僵
+ var url = "";
+ var user = sessionStorage["HUserName"];
+ if (type == 1) {
+ var sWhere = "and 鍒跺崟浜� = '" + user + "'"
+ url = 'Pay_ProcPriceRequestBillController/GetPay_ProcPriceRequestBillList_Json';
+ userData = { "sWhere": sWhere, "HMaker": sessionStorage["HUserName"] };
+
+ } else if (type == 2) {
+ url = '/Pay_ProcPriceRequestBill/NeedChecklist';
+ userData = { "user": user, "userid": sessionStorage["Czybm"]}
+ }
+ else if (type == 3) {
+ url = '/Pay_ProcPriceRequestBill/Checkedlist';
+ userData = { "user": user }
+ } else {
+ var url = "";
+ userData = { "user": user}
+ }
+ $.ajax({
+ url: GetWEBURL() + url,
+ type: "GET",
+ async: false,
+ data: userData,
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ optionSend.cols = [col];
+ optionNeedCheck.cols = [col];
+ optionChecked.cols = [col];
+
+ if (type == 1) {
+ optionSend.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionSend.cols[0].length; i++) {
+ colList.push(optionSend.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionSend.data = result;
+ table.render(optionSend);
+ option = optionSend;
+ } else if (type == 2) {
+ optionNeedCheck.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionNeedCheck.cols[0].length; i++) {
+ colList.push(optionNeedCheck.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionNeedCheck.data = result;
+ table.render(optionNeedCheck);
+ option = optionNeedCheck;
+ }
+ else if (type == 3) {
+ optionChecked.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionChecked.cols[0].length; i++) {
+ colList.push(optionChecked.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionChecked.data = result;
+ table.render(optionChecked);
+ option = optionChecked;
+ } else {
+ /*table.render(optionSend);*/
+ }
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+
+ } else {
+ table.render(option);
+
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function get_ShowBill(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹氶鐢宠鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ /*get_FastQuery(table, option);*/
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙戣捣瀹℃壒
+ function set_startCheckBill(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/StartCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function get_CheckFlowInfo(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num, tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#endregion
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
index 85cc8e4..183d590 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\256\232\351\242\235\347\224\263\350\257\267/Pay_ProcPriceRequestBillList.html"
@@ -160,6 +160,11 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>澶氱骇鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Close" id="btn_Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeClose" id="btn_DeClose"><i class="layui-icon layui-icon-circle"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Drop" id="btn_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
@@ -390,6 +395,21 @@
break;
//鍙嶅鏍告寜閽�
case 'btn_DeAudit': set_CheckBill(2);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill();
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo();
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
break;
//鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn_Close': set_CloseBill(1);
@@ -668,6 +688,151 @@
}
//#endregion
+
+ //#region 鍙戣捣瀹℃壒
+ function set_startCheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/StartCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function get_CheckFlowInfo() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_ProcPriceRequestBill/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
//#region 鍒楄缃�
function get_HideColumn() {
var colName = "";
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_SingleBalBillEdit.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_SingleBalBillEdit.html"
index b20275b..b8ceaba 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_SingleBalBillEdit.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_SingleBalBillEdit.html"
@@ -112,7 +112,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -121,17 +121,18 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -755,6 +756,10 @@
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
}
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
+ }
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
HSourceTitle = "鐢熶骇閫�搴撳崟";
@@ -805,22 +810,18 @@
, "HGroupID": result.data[0].HGroupID == null ? 0 : result.data[0].HGroupID
, "HGroupName": result.data[0].鐝粍
});
- $("#HMainSourceInterID").val(result.data[0].hmainid);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -845,7 +846,7 @@
, "HSubsidyMoney": result.data[i].HSubsidyMoney == null ? 0 : result.data[i].HSubsidyMoney
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1247,14 +1248,39 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = OptionData.HItemID;
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HMaterID": OptionData.HItemID
, "HMaterNumber": OptionData.鐗╂枡浠ｇ爜
, "HMaterName": OptionData.鐗╂枡鍚嶇О
, "HMaterModel": OptionData.瑙勬牸鍨嬪彿
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1282,13 +1308,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = OptionData.HItemID;
+ var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HProcID": OptionData.HItemID
, "HProcNumber": OptionData.宸ュ簭浠ｇ爜
, "HProcName": OptionData.宸ュ簭鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1316,13 +1367,38 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
+ //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
+ var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
+ var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
+ var HSourceID = OptionData.HItemID;
+ var HPrice = subTable_GetHPrice2(HMaterID, HProcID, HSourceID); //宸ヤ环
+ var HQty = obj.data.hasOwnProperty("HQty") ? obj.data.HQty + "" : "0"; //鏁伴噺
+ var HPackQty = obj.data.hasOwnProperty("HPackQty") ? obj.data.HPackQty + "" : "0"; //鍖呰鏁伴噺
+ var HPackPrice = obj.data.hasOwnProperty("HPackPrice") ? obj.data.HPackPrice + "" : "0"; //鍖呰鍗曚环
+ var HPriceRate = obj.data.hasOwnProperty("HPriceRate") ? obj.data.HPriceRate + "" : "0"; //瀹氶娴姩姣旂巼
+ var HSubsidyQty = obj.data.hasOwnProperty("HSubsidyQty") ? obj.data.HSubsidyQty + "" : "0"; //琛ヨ创鏁伴噺
+ var HSubsidyTotal = obj.data.hasOwnProperty("HSubsidyTotal") ? obj.data.HSubsidyTotal + "" : "0"; //琛ヨ创鍚堣
+ var HDeuctTotal = obj.data.hasOwnProperty("HDeuctTotal") ? obj.data.HDeuctTotal + "" : "0"; //鎵ｆ灏忚
+ var HPackMoney = HPackQty * HPackPrice; //鍖呰閲戦=鍖呰鏁伴噺*鍖呰鍗曚环
+ var HSubsidyMoney = HSubsidyQty * HPrice; //琛ヨ创閲戦=琛ヨ创鏁伴噺*宸ヤ环
+ var HMoney = 0; //閲戦
+ if (HPriceRate == 0) {
+ //閲戦=鏁伴噺*宸ヤ环+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ else {
+ //閲戦=鏁伴噺*宸ヤ环*瀹氶娴姩姣旂巼+鍖呰閲戦+琛ヨ创閲戦+琛ヨ创鍚堣-鎵ｆ灏忚
+ HMoney = Number(HQty * HPrice * HPriceRate) + Number(HPackMoney) + Number(HSubsidyMoney) + Number(HSubsidyTotal) - Number(HDeuctTotal);
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": OptionData.HItemID
, "HSourceNumber": OptionData.鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": OptionData.鐢熶骇璧勬簮鍚嶇О
+ , "HPrice": HPrice
+ , "HMoney": HMoney
})
- //鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
- subTable_GetHPrice();
+ table.render(option);
}
})
}
@@ -1774,6 +1850,33 @@
}
//#endregion
+ //#region 鏍规嵁鐗╂枡銆佸伐搴忋�佺敓浜ц祫婧愬姞杞藉伐浠�
+ function subTable_GetHPrice2(HMaterID, HProcID, HSourceID) {
+ var HPrice = 0;
+ if (HMaterID != "0" && HProcID != "0") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID },
+ success: function (data) {
+ if (data.count == 1) {
+ HPrice = data.data;
+ }
+ else {
+ layer.msg(data.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ return HPrice;
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -1934,11 +2037,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -1947,7 +2050,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
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 4975aca..93946c6 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"
@@ -102,7 +102,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">宸ヨ祫绫诲瀷<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HPayTypeName" id="HPayTypeName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
@@ -111,23 +111,24 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">璁′欢宸ヨ祫<label style="color:red"> * </label></label>
+ <label class="layui-form-label">璁′欢宸ヨ祫</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
+ <!--<input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>-->
+ <input type="number" name="HSumMoney" id="HSumMoney" lay-verify="HSumMoney" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();"readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬琛ヨ创<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬琛ヨ创</label>
<div class="layui-input-inline">
<input type="number" name="HOtherSubsidy" id="HOtherSubsidy" lay-verify="HOtherSubsidy" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍏朵粬鎵ｆ<label style="color:red"> * </label></label>
+ <label class="layui-form-label">鍏朵粬鎵ｆ</label>
<div class="layui-input-inline">
<input type="number" name="HOtherDeduct" id="HOtherDeduct" lay-verify="HOtherDeduct" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
@@ -144,10 +145,11 @@
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
<select name="HSourceBillType" id="HSourceBillType" lay-filter="HSourceBillType" style="width: 180px; ">
- <option value="1202">鐢熶骇鍏ュ簱鍗�</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
+ <!--<option value="1202">鐢熶骇鍏ュ簱鍗�</option>
<option value="1245">鐢熶骇閫�搴撳崟</option>
<option value="1207">鐩存帴璋冩嫧璁㈠崟</option>
- <option value="3714">宸ュ簭姹囨姤鍗�</option>
+ <option value="3714">宸ュ簭姹囨姤鍗�</option>-->
<option value="-1">鎵嬪伐褰曞叆</option>
</select>
</div>
@@ -681,7 +683,7 @@
, { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveDays', title: '璇峰亣澶╂暟', width: 100, edit: 'text', totalRow: true, hide: true }
, { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', width: 100, edit: 'text', totalRow: true, hide: true }
- , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HMoney', title: '璁′欢宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
, { field: 'HOtherSubsidy', title: '鍏朵粬琛ヨ创', width: 100, edit: 'text', totalRow: true }
, { field: 'HOtherDeduct', title: '鍏朵粬鎵ｆ', width: 100, edit: 'text', totalRow: true }
, { field: 'HYF', title: '搴斾粯宸ヨ祫', width: 100, style: 'background-color:#efefef4d;', totalRow: true }
@@ -866,6 +868,8 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '2');
}
else {
@@ -914,6 +918,10 @@
if ($("#HSourceBillType").val() == "1202") {
url = "../../浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html?OperationType=2&ViewName=h_v_Pay_ProductInBillList_Source";
HSourceTitle = "鐢熶骇鍏ュ簱鍗�";
+ }
+ else if ($("#HSourceBillType").val() == "3791") {
+ url = "../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html?sProcExchBillNo=undefined&OperationType=2&ViewName=h_v_Pay_StationOutBillList_Source";
+ HSourceTitle = "宸ュ簭鍑虹珯姹囨姤鍗�";
}
else if ($("#HSourceBillType").val() == "1245") {
url = "../../鐢熶骇绠＄悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html";
@@ -969,25 +977,21 @@
set_InitGrid2(); //鍒濆鍖栧瓙琛�
GetEmployee(); //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
}
- $("#HMainSourceInterID").val(result.data[0].HMainID);
- $("#HMainSourceEntryID").val(result.data[0].hsubid);
- $("#HMainSourceBillType").val(result.data[0].HBillType);
- $("#HMainSourceBillNo").val(result.data[0].鍗曟嵁鍙�);
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
"HMaterID": result.data[i].HMaterID == null ? 0 : result.data[i].HMaterID
- , "HMaterNumber": result.data[i].鐗╂枡浠ｇ爜
- , "HMaterName": result.data[i].鐗╂枡鍚嶇О
+ , "HMaterNumber": result.data[i].HMaterNumber
+ , "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].瑙勬牸鍨嬪彿
, "HUnitID": result.data[i].HUnitID == null ? 0 : result.data[i].HUnitID
, "HUnitNumber": result.data[i].璁￠噺鍗曚綅浠ｇ爜
, "HUnitName": result.data[i].璁￠噺鍗曚綅鍚嶇О
, "HProcID": result.data[i].HProcID == null ? 0 : result.data[i].HProcID
- , "HProcNumber": result.data[i].宸ュ簭浠ｇ爜
- , "HProcName": result.data[i].宸ュ簭鍚嶇О
+ , "HProcNumber": result.data[i].HProcNumber
+ , "HProcName": result.data[i].HProcName
, "HSourceID": result.data[i].HSourceID == null ? 0 : result.data[i].HSourceID
, "HSourceNumber": result.data[i].鐢熶骇璧勬簮浠ｇ爜
, "HSourceName": result.data[i].鐢熶骇璧勬簮鍚嶇О
@@ -997,7 +1001,7 @@
, "HPrice": result.data[i].HPrice == null ? 0 : result.data[i].HPrice
, "HMoney": result.data[i].HMoney == null ? 0 : result.data[i].HMoney
, "HSourceBillType": result.data[i].HBillType == null ? "" : result.data[i].HBillType
- , "HSourceInterID": result.data[i].HMainID == null ? 0 : result.data[i].HMainID
+ , "HSourceInterID": result.data[i].hmainid == null ? 0 : result.data[i].hmainid
, "HSourceEntryID": result.data[i].hsubid == null ? 0 : result.data[i].hsubid
, "HSourceBillNo": result.data[i].鍗曟嵁鍙� == null ? "" : result.data[i].鍗曟嵁鍙�
, "HICMOInterID": result.data[i].HICMOInterID == null ? 0 : result.data[i].HICMOInterID
@@ -1017,6 +1021,9 @@
table.render(option);
//鏍规嵁鐗╂枡鍜屽伐搴忓姞杞藉伐浠�
subTable_GetHPrice();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
element.tabChange('tab-GroupBalBill', '1');
}
@@ -1408,9 +1415,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1453,9 +1460,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1498,9 +1505,9 @@
, "HPrice": HPrice
, "HMoney": HMoney
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
}
})
}
@@ -1582,9 +1589,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
case "HPrice": //宸ヤ环
//鏁版嵁鏍煎紡鏍￠獙
@@ -1610,9 +1617,9 @@
, HMoney: HMoney
});
table.render(option);
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
+ //鍙樻洿琛ㄥご鏁版嵁鍜屽瓙琛�2鏁版嵁
+ Sub1ChangeMain();
+ MainChangeSub2();
break;
default:
}
@@ -1938,6 +1945,8 @@
value.HAvgFlag = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
});
//#endregion
@@ -2022,9 +2031,6 @@
, "HCTPrjNumber": OptionData.HCTPrjNumber
, "HCTPrjName": OptionData.HCTPrjName
})
- //鍙樻洿瀛愯〃2鏁版嵁鍜岃〃澶存暟鎹�
- Sub1ChangeSub2();
- Sub2ChangeMain();
}
})
}
@@ -2082,6 +2088,34 @@
//layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
switch (field) {
+ case "HBaseTimes": //鍩烘湰宸ユ椂
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + "";
+ if (!ref.test(temp) || temp == 0) {
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({
+ HBaseTimes: oldText
+ });
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ layer.msg("鍩烘湰宸ユ椂锛氭暟鎹敊璇紝鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HBaseTimes = isNaN(value) ? 0 : value; //鍩烘湰宸ユ椂
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HBaseTimes: HBaseTimes
+ });
+ //table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ break;
case "HMoney": //璁′欢宸ヨ祫
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
@@ -2111,8 +2145,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherSubsidy": //鍏朵粬琛ヨ创
//鏁版嵁鏍煎紡鏍￠獙
@@ -2143,8 +2175,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
case "HOtherDeduct": //鍏朵粬鎵ｆ
//鏁版嵁鏍煎紡鏍￠獙
@@ -2175,8 +2205,6 @@
table.render(option2);
//鍒锋柊璁剧疆澶嶉�夋鐘舵��
CheckedSet_tableSub2();
- //鍙樻洿琛ㄥご鏁版嵁
- Sub2ChangeMain();
break;
default:
}
@@ -2213,7 +2241,10 @@
});
}
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = isNaN(rowList[i].HQty) ? 0 : rowList[i].HQty; //鏁伴噺
+ var HMoney = HQty * HPrice; //閲戦
option.data[i]["HPrice"] = HPrice;
+ option.data[i]["HMoney"] = HMoney;
}
table.render(option);
}
@@ -2296,6 +2327,54 @@
}
//#endregion
+ //#region 瀛愯〃1鍙樻洿鏀瑰彉涓昏〃
+ function Sub1ChangeMain() {
+ var HSumMoney = 0;
+ //鎬婚噾棰�
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HMaterID"] != "0") {
+ HSumMoney += option.data[i]["HMoney"] * 1;
+ }
+ }
+
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HSumMoney").val(HSumMoney);
+ $("#HPayMoney").val(HPayMoney);
+ }
+ //#endregion
+
+ //#region 涓昏〃鍙樻洿鏀瑰彉瀛愯〃2
+ function MainChangeSub2() {
+ var HPayMoney = $("#HPayMoney").val(); //搴旀敮浠樺伐璧�
+ var HBaseTimes = 0;
+ //鍛樺伐鎬诲伐鏃�
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && option2.data[i]["HAvgFlag"] == true) {
+ HBaseTimes += option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * 1;
+ }
+ }
+ if (HBaseTimes == 0) {
+ for (var i = 0; i < option2.data.length; i++) {
+ option2.data[i]["HMoney"] = (0).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ else {
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HEmpID"] != "0" && HBaseTimes != 0) {
+ option2.data[i]["HMoney"] = (option2.data[i]["HBaseTimes"] * option2.data[i]["HEmpRate"] * (HPayMoney / HBaseTimes)).toFixed(4);
+ option2.data[i]["HYF"] = (option2.data[i]["HMoney"] * 1 + option2.data[i]["HOtherSubsidy"] * 1 - option2.data[i]["HOtherDeduct"] * 1).toFixed(4);
+ }
+ }
+ }
+ table.render(option2);
+ //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+ CheckedSet_tableSub2();
+ }
+ //#endregion
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -2305,6 +2384,19 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ //鏁板�煎瀷瀛楁锛岀晫闈负绌烘椂锛岃祴鍊间负0
+ if ($("#HSumMoney").val() == '') {
+ data.field.HSumMoney = 0
+ }
+ if ($("#HOtherSubsidy").val() == '') {
+ data.field.HOtherSubsidy = 0
+ }
+ if ($("#HOtherDeduct").val() == '') {
+ data.field.HOtherDeduct = 0
+ }
+ if ($("#HPayMoney").val() == '') {
+ data.field.HPayMoney = 0
+ }
//鑾峰彇鐢熶骇姹囨姤鍒楄〃瀛愯〃鏁版嵁
var tableSub1 = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -2329,7 +2421,7 @@
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr2 + ';' + OperationType + ";" + HMaker;
- if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ if (!AllowLoadData(sSubStr2))//鏁版嵁楠岃瘉
{
return false;
}
@@ -2395,6 +2487,32 @@
form.render('checkbox');
}
//#endregion
+
+ //#region 鐩戝惉鏂囨湰妗�
+
+ //鍏朵粬琛ヨ创
+ $("#HOtherSubsidy").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney*1 + HOtherSubsidy*1 - HOtherDeduct*1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+
+ //鍏朵粬鎵ｆ
+ $("#HOtherDeduct").on("input", function (e) {
+ var HSumMoney = $("#HSumMoney").val(); //璁′欢宸ヨ祫
+ var HOtherSubsidy = $("#HOtherSubsidy").val(); //鍏朵粬琛ヨ创
+ var HOtherDeduct = $("#HOtherDeduct").val(); //鍏朵粬鎵ｆ
+ var HPayMoney = HSumMoney * 1 + HOtherSubsidy * 1 - HOtherDeduct * 1; //搴旀敮浠樺伐璧�
+ $("#HPayMoney").val(HPayMoney);
+ //鍙樻洿瀛愯〃2鏁版嵁
+ MainChangeSub2();
+ });
+ //#endregion
+
});
@@ -2490,11 +2608,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HEmpID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HPrice == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヤ环涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if (sSubStr[i].HYF == 0) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,搴斾粯宸ヨ祫涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -2503,7 +2621,6 @@
return Result;
}
return Result;
-
}
</script>
</body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index 3ea65fb..f6247bb 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -270,8 +270,8 @@
//鑾峰彇鍒跺崟浜� 鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index db4a0a3..7ec8faf 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -270,8 +270,8 @@
//鑾峰彇鍒跺崟浜� 鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]);
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HScanDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
@@ -522,19 +522,41 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
+ var HBillType = "";
+ var barNo = "";
+ if (HBarCode.length < 22) {
+ barNo = HBarCode.substr(0, 4);
+ switch (barNo) {
+ case "GXLX":
+ HBillType = "3772";
+ break;
+ }
+ }
+
+ if (HBarCode.length > 22) {
+ barNo = HBarCode.substr(0, 22);
+ switch (barNo) {
+ case "https://qr61.cn/omM1Cj":
+ HBillType = "3899";
+ break;
+ case "https://qr61.cn/oAhaGh":
+ HBillType = "3308";
+ break;
+ }
+ }
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Sc_MouldUpperBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": "Sc_MouldUpperBill" },
+ data: { "HBarCode": HBarCode, "HSourceID": $("#HSourceID").val(), "UserID": sessionStorage["Czybm"], "HBillType": HBillType },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
layer.close(index);
$("#HBarCode").val("");
-
+
var num = data["Num"];
if ($("#HSourceID").val() == "0" && num != 1) {
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\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.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\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.html"
new file mode 100644
index 0000000..4fd6902
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MoldMainoverdueWarnReport.html"
@@ -0,0 +1,295 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>妯″叿淇濆吇閫炬湡棰勮鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯″叿鍒嗙被锛�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HMouldType" name="HMouldType" id="HMouldType" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <input type="hidden" name="HMouldTypeID" id="HMouldTypeID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldType" id="btnHMouldType" style="">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="margin-left:40px;">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExit" id="btnExit" style="padding:0 5px">閫�鍑�</button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ , tree = layui.tree
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sb_EquipMaintainWarningReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "Hprocid", "HUSEORGID","璁惧绫诲瀷"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(btnExit)', function (data) {
+ Pub_Close(2);
+ });
+
+ //妯″叿鍒嗙被
+ form.on('submit(btnHMouldType)', function (data) {//閫夋嫨璁惧鍒嗙被
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '璁惧鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldTypeID").val(checkStatus.data[0].HItemID);
+ $("#HMouldType").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ var HMouldTypeID = $("#HMouldTypeID").val();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MouldRepairCheckTaskReport/Sc_MoldMainoverdueWarnReport',
+ type: "GET",
+ data: { "HMouldTypeID": HMouldTypeID,"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ , totalRow: true
+ , done: function (res, curr, count) {
+ ////淇敼鍗曞厓鏍奸鑹�
+ ////宸茬偣妫� Y
+ ////鏈偣妫� E
+ ////棰勮 P
+ //var that = this.elem.next();
+ //res.data.forEach(function (item, index) {
+ // var tr = that.find("[data-index=" + index + "]").children();
+ // tr.each(function () {
+ // var tableText = $(this).text(); //鍗曞厓鏍间腑鐨勫唴瀹�
+ // if (tableText == "Y") {
+ // $(this).css("background-color", "#D6F7D1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#ff241c");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // else if (tableText == "E") {
+ // $(this).css("background-color", "#F5C6C6");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else if (tableText == "P") {
+ // $(this).css("background-color", "#F5F5C1");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // } else {
+ // //$(this).css("background-color", "#fffefd");//鍗曞厓鏍艰儗鏅鑹�
+ // //$(this).css("color", "#45ff2a");//鍗曞厓鏍煎瓧浣撻鑹�
+ // }
+ // })
+ //})
+
+ soulTable.render(this);
+ }
+ }
+
+ ins = table.render(option);
+
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ option.data = data1.data
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(sql) {
+ var HMouldType = $("#HMouldType").val();
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMouldType").val("");
+ $("#HMouldTypeID").val("0");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , height: 'full-50'
+ , page: true
+ , totalRow: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 200
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ };
+ }
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
index d85c89f..73d3eb7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeUseBillList.html"
@@ -269,8 +269,8 @@
, { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, width: 165 }
, { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', sort: true, width: 165, totalRow: true }
- , { field: '鏈鑰楃敤', title: '涓婃鑰楃敤', sort: true, width: 165, totalRow: true }
- , { field: '鏈鍓╀綑瀵垮懡', title: '涓婃鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鑰楃敤', title: '鏈鑰楃敤', sort: true, width: 165, totalRow: true }
+ , { field: '鏈鍓╀綑瀵垮懡', title: '鏈鍓╀綑瀵垮懡', sort: true, width: 165, totalRow: true }
, { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', sort: true, width: 165 }
, { field: '鎽樿', title: '鎽樿', sort: true, width: 165 }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index b2ee8de..8eafd39 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -410,6 +410,17 @@
</button>
</div>
</div>
+ <div class="layui-inline" style="margin-left:10px;">
+ <label class="layui-form-label">鍣ㄥ叿鍙敤鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
+ <option value="姝ｅ父" selected="selected">姝ｅ父</option>
+ <option value="寮傚父">寮傚父</option>
+ <option value="淇濆吇">淇濆吇</option>
+ <option value="缁翠慨">缁翠慨</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1744,6 +1755,7 @@
$("#HNowSPID").val(d.data[0].褰撳墠浠撲綅ID);
$("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
$("#HMouldStatus").val(d.data[0].妯″叿鐘舵��);
+ $("#HMouldUseStatus").val(d.data[0].妯″叿鍙敤鐘舵��);
var HCycleUnit = d.data[0].鍛ㄦ湡鍗曚綅;
var HCheckCycle = d.data[0].淇濆吇鍛ㄦ湡;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.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_MouldMaintainPlanBillList.html"
index ad76b61..4b0114d 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_MouldMaintainPlanBillList.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_MouldMaintainPlanBillList.html"
@@ -496,7 +496,28 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr;
+ var num = [];
+ if (OperationType==3) {
+ //鑾峰彇瀛愯〃鏁版嵁
+ for (var i = 0; i < table.cache["mainTable_plan"].length; i++) {
+ if (table.cache["mainTable_plan"][i] != "") {
+ table.cache["mainTable_plan"][i].LAY_TABLE_INDEX = i;
+ if (table.cache["mainTable_plan"][i].HRelationFlag == "鏈偣妫�") {
+ table.cache["mainTable_plan"][i].HRelationFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HRelationFlag = true
+ }
+ if (table.cache["mainTable_plan"][i].HSendFlag == "鏈彂閫�") {
+ table.cache["mainTable_plan"][i].HSendFlag = false
+ } else {
+ table.cache["mainTable_plan"][i].HSendFlag = true
+ }
+ num.push(table.cache["mainTable_plan"][i])
+ }
+ }
+ }
+ var sSubStr2 = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"] + ";" + sSubStr + ";" +sSubStr2;
if (AllowLoadData(sSubStr1)) {
$.ajax(
{
@@ -515,13 +536,12 @@
}
else {
layer.alert(data.Message, { icon: 5 });
- //console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
- //console.log("Reason" + sMainStr);
+
}
});
}
@@ -593,6 +613,7 @@
, page: false
, totalRow: true
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -623,6 +644,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -646,9 +668,9 @@
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
, { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
- , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
- , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
- , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
+ , { field: 'HErrBeginQty', edit: 'text', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', edit: 'text', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', edit: 'text', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
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_MouldMaintainRuleBillEdit.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_MouldMaintainRuleBillEdit.html"
index 0941ea2..f28cb72 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_MouldMaintainRuleBillEdit.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_MouldMaintainRuleBillEdit.html"
@@ -92,7 +92,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍐插埡鏁�</label>
+ <label class="layui-form-label">淇濆吇鍐插埡鏁�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HUseQtys" id="HUseQtys" class="layui-input" value="0">
</div>
@@ -100,19 +100,19 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
</div>
@@ -452,6 +452,7 @@
, totalRow: true
, page: false
, cellMinWidth: 120
+ , limit: 500
, height: 500
, cols: [columns]
, done: function (res, curr, count) {
@@ -878,6 +879,22 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HUseQtys").val() == '' || $("#HUseQtys").val() == null) {
+ layer.msg("淇濆吇鍐插埡鏁颁笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarQtys").val() == '' || $("#HErrWarQtys").val() == null) {
+ layer.msg("淇濆吇棰勮娆℃暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
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_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_MaterToSourceStepBillList.html"
index eae9a1c..58a74a2 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_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_MaterToSourceStepBillList.html"
@@ -393,8 +393,10 @@
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', sort: true }
, { field: 'HEquipID', title: 'HEquipID', hide: true, sort: true }
- , { field: '鐢熶骇璁惧浠ｇ爜', title: '鐢熶骇璁惧浠ｇ爜', sort: true }
- , { field: '鐢熶骇璁惧', title: '鐢熶骇璁惧', sort: true }
+ , { field: '鐢熶骇涓昏澶囦唬鐮�', title: '鐢熶骇涓昏澶囦唬鐮�', sort: true }
+ , { field: '鐢熶骇涓昏澶�', title: '鐢熶骇涓昏澶�', sort: true }
+ , { field: '杈呭姪璁惧浠ｇ爜', title: '杈呭姪璁惧浠ｇ爜', sort: true }
+ , { field: '杈呭姪璁惧', title: '杈呭姪璁惧', sort: true }
, { field: 'HWorkerID', title: 'HWorkerID', hide: true, sort: true }
, { field: '鎿嶄綔宸ヤ唬鐮�', title: '鎿嶄綔宸ヤ唬鐮�', sort: true }
, { field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', sort: true }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index 3bf0ede..02341cf 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -509,7 +509,6 @@
}
-
//鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 76c680e..39f58d1 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -167,26 +167,38 @@
</button>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">澶辨晥鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
</div>
- </div>-->
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-inline">
@@ -532,7 +544,7 @@
var rowdata = [{
"HProcNo": "10", "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
- , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": "","宸ユ":""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
, "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
, "HWorkQty": 1, "HSNCtrl": false, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
@@ -561,16 +573,18 @@
, height: 400
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', totalRow: true }
, { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
- // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
+ , { field: 'HProcID_S', title: '宸ユID', hide: true }//, hide: true
+ , { field: '宸ユ', title: '宸ユ', edit: 'text', event: "CheckHProcMulID" }//f7
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', edit: 'text', event: "CheckHCenterID" }//涓嶅～
- // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
+ , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }//, hide: true
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
, { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- // , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -587,7 +601,6 @@
//, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
//, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
//, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
- , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', totalRow: true, width: 120 }//榛樿
, { field: 'HSNCtrl', title: 'SN杩囩珯鎺у埗', templet: "#HSNCtrl", width: 120 }
, { field: 'HMaterToSourceCtrl', title: '涓婃枡闃查敊鎺у埗', templet: "#HMaterToSourceCtrl", width:120 }
, { field: 'HQCFst', title: '鏄惁棣栦欢', templet: "#HQCFst", width: 120 }
@@ -624,8 +637,7 @@
//, { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
//, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
//, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
- //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
- , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+ //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
//, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
//, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
//, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
@@ -731,6 +743,8 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(2100,12,31), "yyyy-MM-dd"));
}
});
}
@@ -984,7 +998,7 @@
var NewRow = {
"HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
- , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": ""
+ , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": "","宸ユ":""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
, "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟�": "", "HSupFlag": false, "HSortProcFlag": false, "HTimeUnit": "", "HUnitTime": 0
, "HWorkQty": 1, "HSNCtrl": false, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
@@ -1643,6 +1657,8 @@
option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
j++;
}
@@ -1677,6 +1693,8 @@
option.data[i]["宸ヤ綔涓績"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
+ option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
+ option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
j++;
}
}
@@ -1706,6 +1724,48 @@
, "宸ヤ綔涓績": OptionData[0].宸ヤ綔涓績
, "HCenterID": OptionData[0].HWorkCenterID
, "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
+ , "HProcID_S": OptionData[0].HProcMulID
+ , "宸ユ": OptionData[0].宸ユ鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
+ })
+ }
+ //宸ユ
+ if (obj.event == "CheckHProcMulID") {
+ //鎵撳紑浜哄憳琛� 灏忕獥浣�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ユ鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ユ": checkStatus.data[0].宸ユ鍚嶇О
+ , "HProcID_S": checkStatus.data[0].HItemID
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "宸ユ": OptionData[0].宸ユ鍚嶇О
+ , "HProcID_S": OptionData[0].HItemID
})
OptionData = [];
}
@@ -1999,12 +2059,14 @@
"HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
, "HInterID": OperationType == 2 ? 0 : d.data[0].hmainid
, "HDate": Format(new Date(d.data[0].鏃ユ湡), "yyyy-MM-dd")
+ , "HBeginDate": Format(new Date(d.data[0].鐢熸晥鏃堕棿), "yyyy-MM-dd")
+ , "HEndDate": Format(new Date(d.data[0].澶辨晥鏃堕棿), "yyyy-MM-dd")
, "HName": d.data[0].宸ヨ壓鍚嶇О
, "HMaterNumber": OperationType == 2 ? "" : d.data[0].鐗╂枡浠ｇ爜
, "HMaterName": OperationType == 2 ? "" : d.data[0].鐗╂枡鍚嶇О
, "HMaterID": OperationType == 2 ? "" : d.data[0].HMaterID
, "HUnitName": d.data[0].璁￠噺鍗曚綅
- , "HUnitID": d.data[0].hunitid
+ , "HUnitID": d.data[0].HUnitID
, "HMainTimeUnit": d.data[0].杩愯鏃堕棿鍗曚綅
, "HMainProcIDName": d.data[0].宸ュ簭鍚嶇О
, "HMainProcID": d.data[0].HMainProcID
@@ -2047,8 +2109,8 @@
{
"HProcNo": d.data[i].宸ュ簭鍙�, "HProcID_S": d.data[i].宸ユ, "HProcType": d.data[i].宸ュ簭绫诲瀷, "HCenterID_S": d.data[i].HCenterID_S, "HCenterID_SName": d.data[i].浜х嚎涓績
, "HWorkQty_S": d.data[i].浜х嚎浜ц兘, "HSubStdEmpQty_S": d.data[i].浜х嚎浜烘暟, "HMouldNo": d.data[i].妯″叿缂栧彿, "HChangeMould": d.data[i].鎹㈡ā鏃堕棿, "HPackStd": d.data[i].鍛ㄨ浆绠辨爣鍑�
- , "HPack": d.data[i].鍛ㄨ浆绠�, "HPutArea": d.data[i].鏆傛斁鍖�, "HMyWorkDays": d.data[i].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[i].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[i].宸ュ簭
- , "HProcID": d.data[i].hprocid, "宸ヤ綔涓績浠ｇ爜": d.data[i].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[i].HCenterID, "宸ヤ綔涓績": d.data[i].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[i].HSupID
+ , "HPack": d.data[i].鍛ㄨ浆绠�, "HPutArea": d.data[i].鏆傛斁鍖�, "HMyWorkDays": d.data[i].鐢熶骇鍛ㄦ湡, "HMyFixWorkDays": d.data[i].鍥哄畾鐢熶骇澶╂暟, "宸ュ簭": d.data[i].宸ュ簭, "宸ユ": d.data[i].宸ユ鍚嶇О
+ , "HProcID": d.data[i].HProcID, "宸ヤ綔涓績浠ｇ爜": d.data[i].宸ヤ綔涓績浠ｇ爜, "HCenterID": d.data[i].HCenterID, "宸ヤ綔涓績": d.data[i].宸ヤ綔涓績鍚嶇О, "HSupID": d.data[i].HSupID
, "渚涘簲鍟嗕唬鐮�": d.data[i].渚涘簲鍟嗕唬鐮�, "渚涘簲鍟�": d.data[i].渚涘簲鍟�, "HSupFlag": d.data[i].濮斿鏍囪 == 0 ? false : true, "HSortProcFlag": d.data[i].鎺掍骇宸ュ簭鏍囪 == 0 ? false : true, "HTimeUnit": d.data[i].鏃堕棿鍗曚綅, "HUnitTime": d.data[i].杩愯鏃堕棿
, "HWorkQty": d.data[i].鍔犲伐鏁伴噺, "HSNCtrl": d.data[i].SN杩囩珯鎺у埗 == 0 ? false : true, "HPassRate": d.data[i].鑹巼, "HOverRate": d.data[i].瓒呴姣斾緥, "HReadyTime": d.data[i].鍑嗗鏃堕棿, "HQueueTime": d.data[i].鎺掗槦鏃堕棿
, "HMoveTime": d.data[i].杞Щ鏃堕棿, "HNextProcFlag": d.data[i].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[i].娴佽浆宸ュ簭 == 0 ? false : true, "HSubStdEmpQty": d.data[i].鏍囧噯浜烘暟, "HSubCanUseSourceQty": d.data[i].鍙搷浣滆澶囨暟
@@ -2285,7 +2347,7 @@
var colName = "";
var contentUrl = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
+ colName += option.cols[0][i]["field"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
@@ -2395,6 +2457,10 @@
} else {
option.cols[0][i + 1]["style"] = "font-size:100%";
}
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
@@ -2416,6 +2482,10 @@
case "R":
option.cols[0][i + 1]["align"] = "right";
break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
}
}
@@ -2495,6 +2565,10 @@
function GetHSupNameValue(obj) {
OptionData = obj;
}
+ //渚涘簲鍟�
+ function GetGyProcMulValue(obj) {
+ OptionData = obj;
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
new file mode 100644
index 0000000..b5ba12c
--- /dev/null
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -0,0 +1,985 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ヨ壓璺嚎寰呭鏍告竻鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="">
+ <div class="layui-card-body"style="padding:1px">
+ <h1 style="text-align:center;margin-bottom:7px;margin-top:7px;"><b>宸ヨ壓璺嚎鏌ヨ</b></h1>
+ <div class="layui-tab layui-tab-card" lay-filter="table">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鎴戝垱寤虹殑</li>
+ <li>闇�瑕佹垜瀹℃牳鐨�</li>
+ <li>鎴戝凡瀹℃牳鐨�</li>
+ </ul>
+ <div class="layui-tab-content" style="">
+ <div class="layui-tab-item layui-show">
+ <script type="text/html" id="toolbarDemoSend">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableSend" lay-filter="mainTableSend"></table>
+ </div>
+ <div class="layui-tab-item ">
+ <script type="text/html" id="toolbarDemoNeedCheck">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableNeedCheck" lay-filter="mainTableNeedCheck"></table>
+ </div>
+ <div class="layui-tab-item ">
+ <script type="text/html" id="toolbarDemoChecked">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>鍙戣捣瀹℃壒</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>鏌ョ湅瀹℃壒杩涘害</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ <table class="" id="mainTableChecked" lay-filter="mainTableChecked"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ window.HDeptType = 0;
+ var tabIndex = 1;//椤电绱㈠紩
+ var option = [];
+ var optionNeedCheck = [];
+ var optionSend = [];
+ var optionChecked = [];
+ var HBillType = 3301;
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+ //#endregion
+ //#endregion
+ var HModName = "Gy_RoutingBillCheckQuery";
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(1);
+ //get_Display(2);
+ //get_Display(3);
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //#region澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableSend)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableSend');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(1);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableSend');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableSend');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableSend');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableSend');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableSend');
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ table.on('toolbar(mainTableNeedCheck)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(2);
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableNeedCheck');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableNeedCheck');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableNeedCheck');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableNeedCheck');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableNeedCheck');
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ table.on('toolbar(mainTableChecked)', function (obj) {
+ switch (obj.event) {
+ //缂栬緫
+ case 'btn-Edit': get_ShowBill('mainTableChecked');
+ break;
+ //鍙戣捣瀹℃壒
+ case 'set_startCheckBill': set_startCheckBill('mainTableChecked');
+ break;
+ //鏌ョ湅瀹℃壒杩涘害
+ case 'get_CheckFlowInfo': get_CheckFlowInfo('mainTableChecked');
+ break;
+ //澶氱骇瀹℃牳
+ case 'set_CheckBill_Flow': set_CheckBill_Flow(0, 'mainTableChecked');
+ break;
+ //澶氱骇鍙嶅鏍�
+ case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1, 'mainTableChecked');
+ break;
+ //椹冲洖
+ case 'set_RejectCheck_Flow': set_RejectCheck_Flow('mainTableChecked');
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display(3);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ table.on('tool(mainTableChecked)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ヨ壓璺嚎'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ table.on('tool(mainTableNeedCheck)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ヨ壓璺嚎'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ table.on('tool(mainTableSend)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ヨ壓璺嚎'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //#region 鐩戝惉Tab鍒囨崲锛屽垏鎹㈡椂瑙﹀彂
+ element.on('tab(table)', function (data) {
+ // 鑾峰彇琚垏鎹㈠埌鐨勯潰鏉跨殑绱㈠紩
+ var index = data.index;
+ // 鎵ц涓�浜涙搷浣滐紝渚嬪鏀瑰彉椤甸潰鍐呭
+ tabIndex = index + 1;
+ get_Display(index+1);
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTableChecked)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableChecked, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ table.on('row(mainTableSend)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableSend, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ table.on('row(mainTableNeedCheck)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTableNeedCheck, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鎺掑簭
+ table.on('sort(mainTableChecked)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableReceive', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionNeedCheck.data = layui.table.cache["mainTableReceive"];
+ table.render(optionNeedCheck);
+ });
+ table.on('sort(mainTableSend)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableSend', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionSend.data = layui.table.cache["mainTableSend"];
+ table.render(optionSend);
+ });
+ table.on('sort(mainTableNeedCheck)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableSendCopy', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionChecked.data = layui.table.cache["mainTableSendCopy"];
+ table.render(optionChecked);
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ optionNeedCheck = {
+ elem: '#mainTableNeedCheck'
+ , toolbar: '#toolbarDemoNeedCheck'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , data : []
+ };
+ optionSend = {
+ elem: '#mainTableSend'
+ , toolbar: '#toolbarDemoSend'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ };
+ optionChecked = {
+ elem: '#mainTableChecked'
+ , toolbar: '#toolbarDemoChecked'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-50'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+
+ };
+ option = optionSend;//鍒濆鍖栧垪璁剧疆option
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄦ牸1涓烘垜鍙戣捣鐨�2鎴戦渶瑕佸鏍哥殑3鎴戝凡瀹℃牳鐨�
+ function get_Display(type) {
+ var ajaxLoad = layer.load();//閬僵
+ var url = "";
+ var user = sessionStorage["HUserName"];
+ if (type == 1) {
+ var sWhere = "and 鍒跺崟浜� = '" + user + "'"
+ url = '/LEMS/MES_Gy_RoutingBillList_Json';
+ userData = { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3301" };
+
+ } else if (type == 2) {
+ url = '/Gy_Routing/NeedChecklist';
+ userData = { "user": user, "userid": sessionStorage["Czybm"]}
+ }
+ else if (type == 3) {
+ url = '/Gy_Routing/Checkedlist';
+ userData = { "user": user }
+ } else {
+ var url = "";
+ userData = { "user": user}
+ }
+ $.ajax({
+ url: GetWEBURL() + url,
+ type: "GET",
+ async: false,
+ data: userData,
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ optionSend.cols = [col];
+ optionNeedCheck.cols = [col];
+ optionChecked.cols = [col];
+
+ if (type == 1) {
+ optionSend.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionSend.cols[0].length; i++) {
+ colList.push(optionSend.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionSend.data = result;
+ table.render(optionSend);
+ option = optionSend;
+ } else if (type == 2) {
+ optionNeedCheck.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionNeedCheck.cols[0].length; i++) {
+ colList.push(optionNeedCheck.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionNeedCheck.data = result;
+ table.render(optionNeedCheck);
+ option = optionNeedCheck;
+ }
+ else if (type == 3) {
+ optionChecked.data = data1.data;
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < optionChecked.cols[0].length; i++) {
+ colList.push(optionChecked.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["鍗曟嵁鍙�"]) {
+ temp = result[i]["鍗曟嵁鍙�"];
+ } else {
+ var initIndex = $.inArray("鍗曟嵁鍙�", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+ optionChecked.data = result;
+ table.render(optionChecked);
+ option = optionChecked;
+ } else {
+ /*table.render(optionSend);*/
+ }
+ DisPlay_HideColumn();
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+
+ } else {
+ table.render(option);
+
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function get_ShowBill(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宸ヨ壓璺嚎'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+ /*get_FastQuery(table, option);*/
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙戣捣瀹℃壒
+ function set_startCheckBill(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/StartCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function get_CheckFlowInfo(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬶紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num, tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow(tableName) {
+ var checkStatus = table.checkStatus(tableName)
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (tableName == 'mainTableSend') {
+ get_Display(1);
+ } else if (tableName == 'mainTableNeedCheck') {
+ get_Display(2);
+ } else if (tableName == 'mainTableChecked') {
+ get_Display(3)
+ }
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#endregion
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index c0ab9c1..c2ba757 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -856,10 +856,12 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- else {
- return true;
- }
+ if (sSubStr[i].HDotCheckResult != true) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁撴灉淇℃伅涓哄嬀閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
}
+ return true;
}
else {
return true;
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index a6177a4..b9c55dc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -634,15 +634,15 @@
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
, { field: 'HSNO', title: '宸ヨ壓娆″簭', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
- , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
+ , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', hide: true, width: 130, edit: 'text', event: "HTechParamIDStdName" }
+ , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', hide: true, width: 130, edit: 'text' }
, { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
, { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -1292,9 +1292,9 @@
return item;
});
- layui.table.reload('mainTable', {
- data: updatedData
- });
+ //layui.table.reload('mainTable', {
+ // data: updatedData
+ //});
// 鍙栨秷缂栬緫鐘舵��
cell.removeAttr('contenteditable');
//鍙栨秷鍐掓场
@@ -1774,7 +1774,11 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HTechParamID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟淇℃伅涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟浠ｇ爜/鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = 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_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 3ae6539..d89e0a8 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"
@@ -53,13 +53,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟</label>
+ <label class="layui-form-label">淇濆吇瀹夊叏澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSafeDays" id="HSafeDays" class="layui-input" value="1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
+ <label class="layui-form-label">淇濆吇棰勮澶╂暟<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="1">
</div>
@@ -922,6 +922,14 @@
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HSafeDays").val() == '' || $("#HSafeDays").val() == null) {
+ layer.msg("淇濆吇瀹夊叏澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HErrWarDays").val() == '' || $("#HErrWarDays").val() == null) {
+ layer.msg("淇濆吇棰勮澶╂暟涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
index 3839f0b..48bae72 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_Add_TakeSampleCheckBill.html"
@@ -264,13 +264,18 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎶ュ簾鍐呭</label>
- <div class="layui-input-inline" style="width:300px;height:15px">
- <textarea placeholder="璇疯緭鍏ユ姤搴熷唴瀹�" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
+ <label class="layui-form-label">閫佹祴绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <select name="TestType" lay-filter="TestType" id="TestType">
+ <option value="棣栨">棣栨</option>
+ <option value="宸℃">宸℃</option>
+ <option value="鏈">鏈</option>
+ <option value="瀹為獙">瀹為獙</option>
+ </select>
</div>
</div>
</div>
- <div class="layui-form-item">
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">浜у搧鍗曢噸1:</label>
<div class="layui-input-inline">
@@ -287,6 +292,12 @@
<label class="layui-form-label">浜у搧鍗曢噸3:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫佹祴鍐呭</label>
+ <div class="layui-input-inline" style="width:300px;height:15px">
+ <textarea placeholder="璇疯緭鍏ラ�佹祴鍐呭" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
</div>
</div>
</div>
@@ -626,6 +637,7 @@
, "HProdWeight1": data[0]["浜у搧鍗曢噸1"] //浜у搧鍗曢噸1
, "HProdWeight2": data[0]["浜у搧鍗曢噸2"] //浜у搧鍗曢噸2
, "HProdWeight3": data[0]["浜у搧鍗曢噸3"] //浜у搧鍗曢噸3
+ , "TestType": data[0]["閫佹祴绫诲瀷"] //閫佹祴绫诲瀷
, "HGroupID": data[0]["HGroupID"] //鐝粍ID
, "HGroupName": data[0]["鐢熶骇鐝粍"] //鐝粍鍚嶇О
, "HShiftsID": data[0]["HShiftsID"] //鐝ID
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
index 77749c2..8a23004 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_EquipMentCollectionTechParam.html"
@@ -55,7 +55,15 @@
</button>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閲囬泦鏉ユ簮</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
+ <option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
+ <option value="璁惧閲囬泦">璁惧閲囬泦</option>
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
@@ -82,92 +90,6 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
-
-
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -319,7 +241,7 @@
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList',
type: "GET",
async:false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -388,98 +310,18 @@
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HEquipType = $("#HEquipType").val();
+
+ if (HEquipNumber != "" || HTechParamName != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HTechParamName: HTechParamName
+ , HDate: HDate
+ , HDate1: HDate1
+ , HEquipType: HEquipType
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
-
- if (HEquipNumber) {
- sWhere += " and 璁惧缂栫爜 = '" + HEquipNumber + "'";
- }
- if (HTechParamName) {
- sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
- }
- if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) <= '" + HDate1 + "'";
- }
- if (HEquipNumber != "" || HTechParamName!="") {
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -519,16 +361,25 @@
//鎶樼嚎鍥剧粦瀹氭暟鎹�
var H_X = [];//X杞存爣棰�
- var HVaule = [];//瀹為檯鍊�
+ var HVaule = [];//瀹為檯鍊�
+ var HStd = [];//鏍囧噯鍊�
+ var HMax = [];//涓婄嚎鍊�
+ var HMin = [];//涓嬮檺鍊�
var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].閲囬泦鏃ユ湡);
}
// 濉厖鏁版嵁
- for (let i = 0; i < option.data.length; i++) {
-
- HVaule.push(option.data[i].鏁伴噰鍊�);
+ for (let i = 0; i < option.data.length; i++) {
+ if ($("#HEquipType").val() == "鎵嬪姩杈撳叆") {
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ HVaule.push(option.data[i].瀹為檯鍊�);
+ } else {
+ HVaule.push(option.data[i].鏁伴噰鍊�);
+ }
}
}
@@ -545,7 +396,7 @@
trigger: 'axis'
},
legend: {
- data: ['鏁伴噰鍊�'],
+ data: ['鏁伴噰鍊�', '涓婇檺鍊�', '涓嬮檺鍊�', '鏍囧噯鍊�'],
top: 'bottom',
left: 'center'
},
@@ -591,6 +442,72 @@
}
},
data: HVaule
+ },
+ {
+ name: '涓婇檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMax
+ },
+ {
+ name: '涓嬮檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMin
+ },
+ {
+ name: '鏍囧噯鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'green' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HStd
}
]
};
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index 344642a..2d998dd 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -657,9 +657,10 @@
series: [
{
name: '宸ユ枡鐜�',
- type: 'line',
+ type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
@@ -675,7 +676,8 @@
name: '鏂欏簾鐜�',
type: 'line',
label: {
- show: true
+ show: true,
+ formatter: '{c}%'
},
itemStyle: {
normal: {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
index ad3ba45..3df14e2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_SkillExamMonthSumReport.html"
@@ -51,14 +51,7 @@
</button>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
- 鍔ㄦ�佹覆鏌撶粍缁�
- </select>
- </div>
- </div>-->
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -766,7 +759,10 @@
type: 'bar',
barWidth: 30,
barGap: 0,
- label: labelOption,
+ label: {
+ ...labelOption,
+ color: '#0066CC' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
@@ -785,7 +781,10 @@
type: 'line',
barWidth: 10,
barGap: 0,
- label: labelOption1,
+ label: {
+ ...labelOption,
+ color: '#FF0000' // 璁剧疆鏍囩棰滆壊涓鸿摑鑹�
+ },
emphasis: {
focus: 'series'
},
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
index dc35223..541bec2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBinding.html"
@@ -344,7 +344,12 @@
layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
return;
}
- }
+ }
+
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
//鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
$("#HBarCode_P").removeAttr("disabled"); //浜у搧鐮佹枃鏈鍚敤
@@ -361,6 +366,20 @@
//娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
option.data = [];
table.render(option);
+
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
//鍘嗗彶缁戝畾璁板綍鏌ヨ
//get_Display();
@@ -493,13 +512,13 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
//鎶婃渶鍚庝竴涓骇鍝佺殑缁戝畾淇℃伅鍐欏叆鍒板巻鍙茶褰曟槑缁嗙綉鏍�
- for (var i = 0; i < option.data.length; i++) {
- option_detail.data.push(option.data[i])
- }
+ //for (var i = 0; i < option.data.length; i++) {
+ // option_detail.data.push(option.data[i])
+ //}
//搴忓垪鍖栬〃澶翠俊鎭拰瀛愯〃淇℃伅
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(option_detail.data);
+ var sSubStr = JSON.stringify(option.data);
//鎷兼帴鍙傛暟
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
@@ -512,7 +531,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
+ layer.msg(data.Message, { icon: 1, time: 1000 });
$("#btnSave").addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
@@ -743,7 +762,7 @@
//鍒锋柊琛ㄦ牸鏁版嵁
option.data[rowIndex].HBarCode = "";
- option.data[rowIndex].HBindingQty = option.data[rowIndex].HBindingQty - 1;
+ option.data[rowIndex].HBindingQty = 0;
//option.data[rowIndex].HMaterID = 0;
option.data[rowIndex].HMaterNumber = "";
option.data[rowIndex].HMaterName = "";
@@ -930,6 +949,9 @@
return Result = false;
}
}
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
return true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index 029286f..bd9c223 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -333,7 +333,19 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ if (data[i].name == "鐓х墖璺緞") {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150, templet: function (e) {
+ var html = "";
+ if (e.宸ュ簭鍚嶇О == "鎷嶇収" ) {
+ html = '<a style="color:#1E9FFF" href="" target="main_self_frame">' + e.鐓х墖璺緞+'</a>';
+ }
+ return html
+ }
+ });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ }
}
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index 7aebc41..e262d9d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -207,6 +207,7 @@
<th>鎿嶄綔鍛�</th>
<td class="bz_td">
<input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">纭畾</button>
</td>
<td class="bz_td">
<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -821,6 +822,89 @@
}
table.render(option)
break;
+ case "P201":
+ case "P202":
+ case "P203":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchHinteID": data.hmainid,
+ "HProcPlanEntryID": data.hsubid,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+ "HPRDOrgID": data.缁勭粐
+ });
+ $("#HProcNo").attr('disabled', 'disabled');
+ HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ var HInterID = data.hmainid;
+ //鑷姩鍖归厤娴佹按鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+ type: "GET",
+ data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.宸ュ簭ID,
+ "HProcNo": data.娴佹按鍙�,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID,
+ "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺),
+ "HQty": data.鍚堟牸鏁伴噺
+ });
+
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ }
+ }
+ })
+
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+ , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+ , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , height: 500
+ }
+ table.render(option)
+
+ break;
}
switch (barNo) {
@@ -1082,6 +1166,38 @@
}
});
}
+
+ //鎿嶄綔鍛樺洖杞︽柟娉�
+ function Operator_KeyDown(sBillNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown_Operator",
+ type: "GET",
+ data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HEmpID": data.HItemID,
+ "HEmpNumber": data.鑱屽憳浠ｇ爜,
+ "HEmpName": data.鑱屽憳鍚嶇О
+ });
+
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//#endregion
//#region 鏌ヨ 宸ヨ壓鍙傛暟
@@ -1446,6 +1562,17 @@
});
//#endregion
+ //#region 鎿嶄綔鍛樼‘瀹氭寜閽�
+ form.on('submit(QueDin_CZY)', function (data) {//
+ var sBillNo = $('#HEmpNumber').val();
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ Operator_KeyDown(sBillNo);
+ });
+ //#endregion
+
form.on('submit(Detail)', function (data) {
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
index 0eb26c6..dc73eca 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\351\230\262\351\224\231\351\252\214\350\257\201/Gy_MaterPreventErrMouldBillList.html"
@@ -430,7 +430,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList',
+ url: GetWEBURL() + '/Gy_MaterPreventErrMouldBill/get锘縂y_MaterPreventErrMouldBillMainList_Main',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 14bc4e7..b5bf9ff 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -681,8 +681,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -782,8 +782,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -872,7 +872,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -1409,7 +1409,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -2920,8 +2920,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -3054,8 +3054,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': HTaxMoney //
, "HMoney": dealDoubleToFixed(HMoney, 2)
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 0d2f742..1a1cc72 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -432,7 +432,10 @@
})
}
//#endregion
-
+ //鍒ゆ柇椤甸潰鎵撳紑鏂瑰紡
+ if (OperationType == null || OperationType == "" || typeof (params[params[0]]) == "undefined") {
+ OperationType = 1;//鎿嶄綔绫诲瀷鍒濆鍖�
+ }
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) { //鍒ゆ柇 linterid 鍙橀噺鏄惁涓虹┖鎴栬�呯瓑浜�0
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index aab3640..449d4ab 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -1372,12 +1372,7 @@
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- if (get_needClose_Bar == 0) {
- $("#btnSearch").trigger('click');
- } else if (get_needClose_Bar == 1) {
- $("#get_needClose").trigger('click');
- }
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 74083ab..5afe216 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -1314,7 +1314,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index 96a1a0c..31270ae 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -664,8 +664,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -716,8 +716,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
, "HMoney": dealDoubleToFixed(HMoney, 2)
@@ -808,8 +808,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
, "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -853,8 +853,8 @@
, "HQty": dealDoubleToFixed(HQty, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
, "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
@@ -946,7 +946,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -1689,7 +1689,7 @@
, "HQty": "0"
, "HPrice": "0"
, "HTaxPrice": "0"
- , 'HDiscountRate': "0"
+ , 'HDiscountRate': "1"
, 'HRelTaxPrice': "0"
, "HTaxRate": "0"
, 'HTaxMoney': "0"
@@ -2008,8 +2008,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -2089,8 +2089,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
@@ -2315,13 +2315,14 @@
return false;
}
- //浠风◣鍚堣鏍煎紡鏍￠獙
+ //绋庨鏍煎紡鏍￠獙
temp = option.data[i]["HTaxMoney"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
- layer.msg("绗�" + (i + 1) + "琛岋細浠风◣鍚堣璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+ //if (temp == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛岋細绋庨涓嶈兘涓�0锛�");
+ // return false;
+ //} else
+ if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛岋細绋庨璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
return false;
}
@@ -2974,8 +2975,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].HNoTaxCost, 2)
@@ -3017,8 +3018,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
@@ -3142,8 +3143,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鎴愭湰鍗曚环, 2)
@@ -3186,8 +3187,8 @@
, "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
- , 'HDiscountRate': "0" //
- , 'HRelTaxPrice': "0"
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
, "HTaxRate": dataArray[i].绋庣巼
, 'HTaxMoney': "0" //
, "HMoney": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
--
Gitblit v1.9.1