From a89d9c0503aaceae783b10ccc8332200f1013448 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 15 五月 2025 14:45:48 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/环境检测单/QC_EnvironmentTestDotCheckBillList.html | 9
WebTM/views/基础资料/生产基础资料/Gy_ScrapReasonList.html | 21
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 23
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 36
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 8
WebTM/views/基础资料/公用基础资料/Gy_WorkStationList.html | 351 +
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBillList.html | 90
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html | 2
WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html | 15
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 348 +
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftList.html | 41
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html | 110
WebTM/views/基础资料/基础资料/Gy_RepairList.html | 33
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html | 264 +
WebTM/views/基础资料/基础资料/Gy_DotCheckItemClassList.html | 32
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html | 114
WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_OrderLev.html | 35
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 22
WebTM/views/基础资料/基础资料/Gy_RepairClass.html | 23
WebTM/views/基础资料/生产基础资料/Gy_ShiftsList.html | 27
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBillList.html | 87
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 20
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 2
WebTM/views/项目管理/周计划/PM_WorkReportWeekBillMainList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_TemporaryArea.html | 28
WebTM/views/基础资料/公用基础资料/Gy_BadPhenomena.html | 32
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html | 2638 +++++++++++++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 8
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 194
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 26
WebTM/views/工资管理/异常工时申请单/Pay_ErrWorkTimesRequestBillList.html | 27
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 53
WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html | 70
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 6
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 47
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html | 7
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html | 2
WebTM/views/生产管理/宝工排产/Gy_RoutingBillReportForLack.html | 46
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 108
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html | 4
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 24
WebTM/views/工资管理/工资单/Pay_PayMentBillList.html | 27
WebTM/views/项目管理/业绩指标/PM_YearEmployeeMoneyBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_MaintainLev.html | 31
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 3
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html | 10
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 82
WebTM/WebTM.csproj.user | 2
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 33
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 34
WebTM/views/系统管理/快捷方式自定义/Xt_UserFastMenu.html | 22
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBill_Add_Edit.html | 63
WebTM/views/基础资料/基础资料/Gy_MaintainClass.html | 23
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdDisposeCheckBillMainList.html | 26
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdRequestBillMainList.html | 26
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html | 103
WebTM/views/基础资料/基础资料/Gy_EquipStatus.html | 31
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 6
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 182
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 14
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 34
WebTM/views/基础资料/基础资料/Gy_RepairCheckList.html | 33
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 27
WebTM/views/生产管理/宝工排产/JIT_NeedMaterPlanConfigBillReportForLack.html | 81
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 21
WebTM/views/基础资料/公用基础资料/Gy_EnvironmentTestItem.html | 8
WebTM/views/基础资料/公用基础资料/Gy_ConkType.html | 21
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdDisposeBillMainList.html | 27
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBill.html | 76
WebTM/views/基础资料/公用基础资料/Gy_MaterTypeEdit.html | 133
WebTM/views/基础资料/公用基础资料/Gy_OrderBackInfo.html | 33
WebTM/views/基础资料/公用基础资料/Gy_CheckNoteItem.html | 31
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 27
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 22
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 12
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html | 29
WebTM/views/基础资料/生产基础资料/Gy_BadResult.html | 33
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 45
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 116
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkStationList.html | 196
WebTM/views/生产管理/班次开班单/Sc_ShiftsBeginInfoBillList.html | 27
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 59
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillList.html | 20
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 27
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Post.html | 92
WebTM/views/生产工序管理/增加不良评审单/QC_Add_NoPassProdCheckBill.html | 2
WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html | 223 +
WebTM/views/基础资料/公用基础资料/Gy_PackType.html | 21
WebTM/views/基础资料/基础资料/Gy_RepairCheckClass.html | 24
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 24
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 19
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PreventErrMould.html | 2
WebTM/views/基础资料/公用基础资料/Gy_SupType.html | 32
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html | 85
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoneyClass.html | 31
WebTM/views/基础资料/基础资料/Gy_DotCheckList.html | 32
WebTM/views/基础资料/基础资料/Gy_DotCheckItemMethodList.html | 32
WebTM/views/质量管理/质量月度目标单/QC_MonthTarGetBillList.html | 28
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_PostSkillList.html | 37
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 27
WebTM/WebTM.csproj | 6
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 10
WebTM/views/质量管理/库存检验单/QC_StockCheckBillList.html | 7
WebTM/views/质量管理/车间自检单/QC_WorkSelfCheckBillList.html | 7
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 32
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoney.html | 30
WebTM/views/user/login.html | 4
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 34
WebTM/views/基础资料/生产基础资料/Gy_ProcMul.html | 16
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 9
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 27
WebTM/views/工资管理/工资结算单(其他)/Pay_OtherBalBillList.html | 27
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList_PDA.html | 2
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckOtherBillList.html | 7
WebTM/views/项目管理/项目阶段/PM_ProjectReportBillList.html | 27
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 222
WebTM/views/基础资料/基础资料/Gy_MaintainList.html | 35
WebTM/views/基础资料/生产基础资料/Gy_Post.html | 35
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html | 32
WebTM/views/项目管理/周计划/PM_WorkTaskWeekBillList.html | 27
WebTM/views/home/console.html | 262
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 27
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 29
WebTM/views/home/console_Mobile.html | 12
WebTM/views/基础资料/公用基础资料/Gy_MaterType.html | 448 +
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA_XiaBao.html | 558 +++
WebTM/views/基础资料/公用基础资料/Gy_CusType.html | 31
WebTM/views/indexMenu.html | 143
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 76
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatFormImport_SS.html | 9
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 9
WebTM/views/基础资料/生产基础资料/Gy_WorkShiftEdit.html | 56
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdConclusionBillMainList.html | 26
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 31
WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html | 32
WebTM/views/生产管理/宝工排产/Cg_PODemandPlanConfigBillReportForLack.html | 82
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 15
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 4
WebTM/views/基础资料/基础资料/Gy_MouldStatus.html | 31
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html | 157
143 files changed, 8,994 insertions(+), 1,375 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 93d0bb3..e5396b5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -335,8 +335,10 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_CheckList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_CusBar_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_Mould_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA_XiaBao.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_Mould_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_Mould_PDA.html" />
@@ -581,13 +583,13 @@
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Cg_PODemandPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Gy_RoutingBillReportForLack.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_NeedMaterPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_PickUpCalculate_BaoGong.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_UnLockRequestBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_UnLockRequestBill.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBill.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
- <Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_NeedMaterPlanConfigBillReportForLack.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
@@ -623,7 +625,6 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_TK.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
- <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_EquipmentProcessList.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OEEStatusReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_BulkEditWorkTime.html" />
@@ -644,7 +645,6 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
- <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillimport_WorkQty.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBill_Excel.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎澶х被\Gy_RoutingGroupEdit.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 444fdd2..980f848 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
index 32e538e..f71435e 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ProcessExchangeBillListView.html"
@@ -18,7 +18,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护鍒�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
+ <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" value="" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
@@ -33,12 +33,19 @@
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
//寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
- layui.use(['table', 'form', 'layer'], function () {
+ layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
, layer = layui.layer;
+
+ var sWhere = "";
+
+ var params = get_UrlVars();
+ var HProcID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭id
+ var HSourceID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐢熶骇璧勬簮id
form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
//var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -64,6 +71,29 @@
});
//#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
+
+
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
@@ -86,16 +116,19 @@
, { field: 'HWorkerID', width: 150, title: 'HWorkerID', hide: true }
, { field: 'HSourceID', width: 150, title: 'HSourceID', hide: true }
, { field: 'HBillType', width: 150, title: 'HBillType', hide: true }
- , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', width: 150, title: '鍗曟嵁鍙�' }
- , { field: '浠诲姟鍗曞彿', width: 150, title: '浠诲姟鍗曞彿' }
- , { field: '鐢熶骇璁㈠崟鍙�', width: 150, title: '鐢熶骇璁㈠崟鍙�' }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', width: 150, title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡',templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '鍗曟嵁鍙�', width: 170, title: '鍗曟嵁鍙�' }
+ , { field: '宸ュ簭', width: 140, title: '宸ュ簭' }
+ , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+ , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
+ , { field: '浠诲姟鍗曞彿', width: 170, title: '浠诲姟鍗曞彿' }
, { field: '鐢熶骇杞﹂棿', width: 150, title: '鐢熶骇杞﹂棿' }
, { field: '浜у搧浠ｇ爜', width: 150, title: '浜у搧浠ｇ爜' }
, { field: '浜у搧', width: 150, title: '浜у搧' }
- , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
, { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
+ , { field: '鐢熶骇璁㈠崟鍙�', width: 170, title: '鐢熶骇璁㈠崟鍙�' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', width: 150, title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
, { field: '鍗曚綅浠ｇ爜', width: 150, title: '鍗曚綅浠ｇ爜' }
, { field: '鍗曚綅', width: 150, title: '鍗曚綅' }
, { field: '鐢熶骇鏁伴噺', width: 150, title: '鐢熶骇鏁伴噺' }
@@ -113,8 +146,7 @@
, { field: '濮斿鍔犲伐鍗曚綅', width: 150, title: '濮斿鍔犲伐鍗曚綅' }
, { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
, { field: '宸ュ簭鍙�', width: 150, title: '宸ュ簭鍙�' }
- , { field: '宸ュ簭浠ｇ爜', width: 150, title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', width: 150, title: '宸ュ簭' }
+ , { field: '宸ュ簭浠ｇ爜', width: 150, title: '宸ュ簭浠ｇ爜' }
, { field: '鍔犲伐璇存槑', width: 150, title: '鍔犲伐璇存槑' }
, { field: '宸ヤ綔涓績浠ｇ爜', width: 150, title: '宸ヤ綔涓績浠ｇ爜' }
, { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
@@ -124,8 +156,7 @@
, { field: '鐝粍', width: 150, title: '鐝粍' }
, { field: '鎿嶄綔宸ヤ唬鐮�', width: 150, title: '鎿嶄綔宸ヤ唬鐮�' }
, { field: '鎿嶄綔宸�', width: 150, title: '鎿嶄綔宸�' }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', width: 150, title: '鐢熶骇璧勬簮浠ｇ爜' }
- , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', width: 150, title: '鐢熶骇璧勬簮浠ｇ爜' }
, { field: '璁″垝鏁伴噺', width: 150, title: '璁″垝鏁伴噺' }
, { field: '娴佽浆鍗℃暟閲�', width: 150, title: '娴佽浆鍗℃暟閲�' }
, { field: '鏃堕棿鍗曚綅', width: 150, title: '鏃堕棿鍗曚綅' }
@@ -174,18 +205,19 @@
, limit: 50
});
///鍔犺浇鏄剧ず鏁版嵁
- function RoadQuery(Where) {
- var index = layer.load();
- var Value = Where;
- if (Value == null) {
- Value = '';
+ function RoadQuery(Value) {
+ var index = layer.load();
+ if (Value != "") {
+ sWhere = " and 鍗曟嵁鍙� like '%" + Value + "%' ";
+ }
+ if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
+ sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
}
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetSc_ProcessExchangeBillListView",
async: true,
- data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
- //data: { "Value": Value },
+ data: { "sWhere": sWhere, "OrganizationID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html"
new file mode 100644
index 0000000..06fb715
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA_XiaBao.html"
@@ -0,0 +1,558 @@
+锘�<!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">
+ <!--寮曠敤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>
+</head>
+<body>
+ <div class="layui-fluid">
+ <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-tab" lay-filter="tab-Kf_MoveStockBillList_PDA_XiaBao">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
+ <li lay-id="2" style="padding:1px;">宸蹭笂浼犲垪琛�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--缂撳瓨鍒楄〃-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--宸蹭笂浼犲垪琛�-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 10px; margin: 0px">
+ <div class="layui-row" style="margin-top: -10px;">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
+ <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">鎾ら攢</button>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="Uploaded-table" lay-filter="Uploaded-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <div class="layui-col-xs2" style="margin-left:0px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var HBillType = '1207'
+ var HMaker = sessionStorage["HUserName"]
+ var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var HBillNo = $('#HBillNo').val()
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var listOption = []; //缂撳瓨鍒楄〃
+ var Uploadedoption = []; //宸蹭笂浼犲垪琛�
+ var columns = "";
+ var Uploadedcolumns = "";
+ var MvarReportTitle = "鐩存帴璋冩嫧鍗曠紦瀛樺垪琛�";
+ var HModName = "Kf_MoveStockBillList_PDA_XiaBao";
+ var ModRightName = "CE_MoveStock2"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var UploadedtitleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_MoveStockBillList_PDA_XiaBao', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //缂撳瓨鍒楄〃
+ listOption = {
+ elem: '#dj-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-150'
+ , page: true //寮�鍚垎椤�
+ , cellMinWidth: 90
+ , limit: 50
+ };
+
+ //宸蹭笂浼犲垪琛�
+ Uploadedoption = {
+ elem: '#Uploaded-table'
+ //, toolbar: '#toolbarDemo'
+ //, totalRow: true
+ , height: 'full-280'
+ , page: true //寮�鍚垎椤�
+ , cellMinWidth: 90
+ , limit: 20
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(dj-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+
+ table.on('row(Uploaded-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#endregion
+
+
+ //#region 缂栬緫鍔熻兘鎺т欢
+
+ form.on('submit(cmdModify)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐩存帴璋冩嫧鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒犻櫎鍔熻兘鎺т欢
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('dj-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_New_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ });
+
+ //#endregion
+
+
+ //#region 鍒锋柊鍔熻兘鎺т欢
+
+ form.on('submit(cmdRefresh)', function () {
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ });
+
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ function DisTempEntryList() {
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_Other_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID, "HSubBillType": '1243' },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐' || data[i].name == '婧愬崟鍗曞彿' || data[i].name == '鍗曟嵁鍐呯爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left' });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ //listOption.totalRow = true;
+ table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ listOption.data = data;
+ //listOption.totalRow = true;
+ table.render(listOption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 閫�鍑哄姛鑳芥帶浠�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.location.href = "../../../views/index_Mobile.html";
+ });
+ })
+
+ //#endregion
+
+
+ //#region 鏌ヨ鍔熻兘鎺т欢
+
+ form.on('submit(cmdQuery)', function () {
+ HBillNo = $("#HBillNo").val();
+ HSourceBillNo = $("#HSourceBillNo").val();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ function DisUploadedList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_User_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) {
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ UploadedtitleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, UploadedtitleData) > -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: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 80 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ Uploadedcolumns = col;
+ Uploadedoption.cols = [Uploadedcolumns];
+ Uploadedoption.data = result.data;
+ //Uploadedoption.totalRow = true;
+ table.cache['Uploaded-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(Uploadedoption);
+ }
+ else {
+ Uploadedoption.cols = [[
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+ ]];
+ Uploadedoption.data = data;
+ //Uploadedoption.totalRow = true;
+ table.render(Uploadedoption);
+ //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+ //#region 鎾ゆ秷鍔熻兘鎺т欢
+
+ form.on('submit(cmdRescind)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DeleteICStockBillAndWMS_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].鍗曟嵁鍙�, "HBillType": HBillType, "HMaker": HMaker, "MvarReportTitle": MvarReportTitle },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ element.tabChange('tab-Kf_MoveStockBillList_PDA_XiaBao', '1');
+ //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+ DisTempEntryList();
+ //鏄剧ず宸蹭笂浼犲垪琛ㄤ俊鎭�
+ DisUploadedList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鎾ら攢锛�');
+ }
+ });
+
+ //#endregion
+
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
new file mode 100644
index 0000000..94d3abf
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -0,0 +1,2638 @@
+锘�<!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">
+ <!--寮曠敤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>
+ <style>
+ .layui-col-xs8 {
+ width: 55.666667%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 0px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>涓撶敤璋冩嫧</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs5">
+ <input type="number" name="HQty" id="HQty" lay-verify="HQty" 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 class="layui-col-xs4">
+ <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MoveStockBill_PDA_XiaBao">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;">閫夋嫨婧愬崟</li>
+ <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鐗╂枡淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="5" style="padding:1px;">涓嬫灦淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--閫夋嫨婧愬崟-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select name="HMainSourceBillType" id="HMainSourceBillType">
+ <option value="1243">璋冩嫧鐢宠鍗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>
+ <div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
+ <option value="缁勭粐鍐呰皟鎷�">缁勭粐鍐呰皟鎷�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10" style="padding-right: 15px;">
+ <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10" style="padding-right: 15px;">
+ <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT" style="width: 45px; margin-left: -5px; padding-left: 12px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:70px;padding-left:0px;">鍗曟嵁瀛愮被鍨�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <select name=" HBillSubType" id="HBillSubType">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+ </div>
+ <div class="layui-col-xs9">
+ <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--琛ㄥご淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HKeeperName" id="HKeeperName" lay-verify="HKeeperName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HKeeperID-BT" class="layui-btn" id="HKeeperID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSecManagerName" id="HSecManagerName" lay-verify="HSecManagerName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSecManagerID-BT" class="layui-btn" id="HSecManagerID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HDeptID-BT" class="layui-btn" id="HDeptID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">瀹㈡埛</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HSupID-BT" class="layui-btn" id="HSupID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鐗╂枡淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--鏉＄爜淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBarCode_B" id="HBarCode_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterName_B" id="HMaterName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HMaterModel_B" id="HMaterModel_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HBatchNo_B" id="HBatchNo_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HUnitName_B" id="HUnitName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HQty_B" id="HQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
+ </div>
+ <div class="layui-col-xs10">
+ <input type="text" name="HTMQty_B" id="HTMQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2" style="margin-left:-10px">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+ </div>
+ <div class="layui-col-xs10" style="margin-left:10px">
+ <input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+ <button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+ <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ </div>
+
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HBillerID" id="HBillerID">
+ <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
+ <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </form>
+ </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;
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var HBillType = '1207'
+ var HRedBlueFlag = false
+ var HMaker = sessionStorage["HUserName"]
+ var HBillerID = sessionStorage["HBillerID"]
+ var HStockInOrgID = sessionStorage["OrganizationID"] //璋冨叆缁勭粐ID
+ var HStockOutOrgID = sessionStorage["OrganizationID"] //璋冨嚭缁勭粐ID
+ var HStockOrgID = sessionStorage["OrganizationID"] //鐧诲叆缁勭粐ID
+ var HSourceFlag = false //鏄惁宸叉壂鐮佹爣蹇�
+ var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var listOption = [];
+ var FIFOListOption = [];
+ var columns = "";
+ var HModName = "Kf_MoveStockBill_PDA_XiaBao";
+ var ModRightName = "CE_MoveStock2"; //妯″潡鏉冮檺鍙傛暟
+ var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+ var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
+
+ //#endregion
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login_pda.html"; });
+ }
+
+ //#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ CheckModRight();
+
+ function CheckModRight() {
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "ModRightName": ModRightName, "HUserName": HMaker },
+ success: function (d) {
+ if (d.count == 1) {
+ }
+ else {
+ layer.msg(d.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+ //#endregion
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿璋冨叆璋冨嚭浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�佺粍缁囩瓑锛� new
+ $("#HWHID").val(sessionStorage["HSCWHID"]);
+ $("#HWHName").val(sessionStorage["HSCWHName"]);
+ $("#HSCWHID").val(sessionStorage["HWHID"]);
+ $("#HSCWHName").val(sessionStorage["HWHName"]);
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+ $("#HSecManagerName").val(sessionStorage["HSecManager"]);
+ $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+ $("#HKeeperName").val(sessionStorage["HKeeper"]);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillerID").val(sessionStorage["HBillerID"]);
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HBillType").val("1207");
+ $("#HRedBlueFlag").val("false");
+ if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceName").val(sessionStorage["HSPName"]);
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '1');
+ set_InitDate(); //鍒濆鍖栬〃鍗曟椂闂�
+ set_InitBillSubType(); //鑾峰彇鍗曟嵁瀛愮被鍨�
+ set_InitStockOrgID(); //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+ function set_InitDate() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+ //鑾峰彇鍗曟嵁瀛愮被鍨�
+ function set_InitBillSubType() {
+ var HBillSubType = '';
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
+ }
+ $("#HBillSubType").append(HBillSubType);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //鑾峰彇璋冨叆璋冨嚭缁勭粐
+ function set_InitStockOrgID() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ success: function (result) {
+ var Organization = "";
+ 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>';
+ }
+ $("#HStockInOrgID").append(Organization);
+ $("#HStockInOrgID").val(HStockInOrgID)
+ $("#HStockOutOrgID").append(Organization);
+ $("#HStockOutOrgID").val(HStockOutOrgID)
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 200
+ };
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: 'HWhName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(wl-table)', function (obj) {
+ var data = obj.data;
+
+ //鐗╂枡浠ｇ爜瓒呴摼鎺�
+ if (obj.event == '鐗╂枡浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var HMaterNumber = data.鐗╂枡浠ｇ爜.toString(); //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠ｇ爜
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '鍙婃椂搴撳瓨淇℃伅' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1 //鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+ if (HInterID != 0) {
+ HSourceFlag = true;
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else if (OperationType == 2) {
+ RoadBillMain(HInterID_Temp);
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ HSourceFlag = true;
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ else {
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ }
+ else {
+ layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ HSourceFlag = false;
+ }
+
+ function RoadBillMain(HInterID_Temp)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetSourceBill_Temp_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID_Temp, "HBillType": HBillType },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ //鑾峰彇婧愬崟绫诲瀷
+ if (d.data[0].HSourceBillType == "1402") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1243") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "3720") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1604") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '濮斿鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1214") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "3721") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇澶囨枡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else if (d.data[0].HSourceBillType == "1242") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+
+ $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ //闈炲婧愬崟妯″紡
+ if (d.data[0].HMulSourceBill == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ if (d.data[0].HDeptID != 0) {
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDeptName);
+ }
+ $("#HSupID").val(d.data[0].HCusID);
+ $("#HSupName").val(d.data[0].HCusName);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HStockStyle").val(d.data[0].HStockStyle);
+ $("#HStockStyle").attr("disabled", true);
+ $("#HStockInOrgID").val(d.data[0].HStockInOrgID);
+ $("#HStockInOrgID").attr("disabled", true);
+ $("#HStockOutOrgID").val(d.data[0].HStockOutOrgID);
+ $("#HStockOutOrgID").attr("disabled", true);
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ })
+ }
+
+ //#endregion
+
+ //#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 璋冨嚭浠撳簱
+ //鎵弿璋冨嚭浠撳簱鏉＄爜
+ $('#HSCWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSCWHName = $('#HSCWHName').val()
+ if (HSCWHName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSCWHName, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSCWHID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ if (result.data[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撳簱鎸夐挳
+ form.on('submit(HSCWHID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨嚭浠撲綅
+ //鎵弿璋冨嚭浠撲綅鏉＄爜
+ $('#HOutStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ var sHSCWHID = $("#HSCWHID").val()
+ var HOutStockPlaceName = $('#HOutStockPlaceName').val()
+ if (HOutStockPlaceName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HOutStockPlaceName, "HWhID": sHSCWHID, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HOutStockPlaceName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HWhName);
+ $("#HSCWHID").val(result.data[0].HWHID);
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撲綅鎸夐挳
+ form.on('submit(HSCSpID-BT)', function () {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HSCWHID").val() + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨叆浠撳簱
+ //鎵弿璋冨叆浠撳簱鏉＄爜
+ $('#HWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ var HWHName = $('#HWHName').val()
+ if (HWHName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HWHName, "HStockOrgID": HStockInOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HWHID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HName);
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ if (result.data[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨叆浠撳簱鎸夐挳
+ form.on('submit(HWHID-BT)', function () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨叆浠撲綅
+ //鎵弿璋冨叆浠撲綅鏉＄爜
+ $('#HStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ var sHWHID = $("#HWHID").val()
+ var HStockPlaceName = $('#HStockPlaceName').val()
+ if (HStockPlaceName == '') {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockInOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HStockPlaceName").val(result.data[0].HName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HWHName").val(result.data[0].HWhName);
+ $("#HWHID").val(result.data[0].HWHID);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HStockPlaceName").select();
+ $("#HStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨叆浠撲綅鎸夐挳
+ form.on('submit(HSpID-BT)', function () {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�' && HStockOutOrgID == HStockInOrgID) {
+ layer.msg("璺ㄧ粍缁囪皟鎷紝璋冨嚭缁勭粐涓庤皟鍏ョ粍缁囦笉鍏佽鐩稿悓锛岃鍏堥�夋嫨姝ｇ‘璋冨叆缁勭粐锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ });
+ return;
+ }
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 淇濈鍛�
+ //鎵弿淇濈鍛樻潯鐮�
+ $('#HKeeperName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HKeeperName = $('#HKeeperName').val()
+ if (HKeeperName == '') {
+ playSound();
+ $("#HKeeperID").val("0");
+ $("#HKeeperName").val("");
+ layer.msg("淇濈鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HKeeperName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HKeeperID").val(result.data[0].HItemID);
+ $("#HKeeperName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HKeeperID").val("0");
+ $("#HKeeperName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HKeeperName").select();
+ $("#HKeeperName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //淇濈鍛樻寜閽�
+ form.on('submit(HKeeperID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 楠屾敹鍛�
+ //鎵弿楠屾敹鍛樻潯鐮�
+ $('#HSecManagerName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSecManagerName = $('#HSecManagerName').val()
+ if (HSecManagerName == '') {
+ playSound();
+ $("#HSecManagerID").val("0");
+ $("#HSecManagerName").val("");
+ layer.msg("楠屾敹鍛樻潯鐮佷负绌猴紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetEmployee_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSecManagerName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSecManagerID").val(result.data[0].HItemID);
+ $("#HSecManagerName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSecManagerID").val("0");
+ $("#HSecManagerName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSecManagerName").select();
+ $("#HSecManagerName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //楠屾敹鍛樻寜閽�
+ form.on('submit(HSecManagerID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 閮ㄩ棬
+ //鎵弿閮ㄩ棬鏉＄爜
+ $('#HDeptName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HDeptName = $('#HDeptName').val()
+ if (HDeptName == '') {
+ playSound();
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ layer.msg("閮ㄩ棬鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetDepartment_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HDeptName },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HDeptID").val(result.data[0].HItemID);
+ $("#HDeptName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HDeptID").val("0");
+ $("#HDeptName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HDeptName").select();
+ $("#HDeptName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //閮ㄩ棬鎸夐挳
+ form.on('submit(HDeptID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 瀹㈡埛
+ //鎵弿瀹㈡埛鏉＄爜
+ $('#HSupName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSupName = $('#HSupName').val()
+ if (HSupName == '') {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg("瀹㈡埛鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetCustomer_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSupName, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSupID").val(result.data[0].HItemID);
+ $("#HSupName").val(result.data[0].HName);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSupID").val("0");
+ $("#HSupName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSupName").select();
+ $("#HSupName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //瀹㈡埛鎸夐挳
+ form.on('submit(HSupID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_CustomerListNew.html?HStockOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 鍔熻兘鎺т欢
+
+ //#region 鎻愪氦
+ form.on('submit(cmdSaver)', function (data) {
+ //浠撳簱銆佷粨浣嶃�佷繚绠°�侀獙鏀躲�侀儴闂ㄣ�佸鎴锋枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ data.field.HWHID = $('#HWHID').val()
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ data.field.HStockPlaceID = $('#HStockPlaceID').val()
+ }
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ data.field.HWHID = $('#HSCWHID').val()
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ data.field.HStockPlaceID = $('#HOutStockPlaceID').val()
+ }
+ if ($("#HKeeperName").val() == '') {
+ $("#HKeeperID").val("0");
+ data.field.HKeeperID = $('#HKeeperID').val()
+ }
+ if ($("#HSecManagerName").val() == '') {
+ $("#HSecManagerID").val("0");
+ data.field.HSecManagerID = $('#HSecManagerID').val()
+ }
+ if ($("#HDeptName").val() == '') {
+ $("#HDeptID").val("0");
+ data.field.HDeptID = $('#HDeptID').val()
+ }
+ if ($("#HSupName").val() == '') {
+ $("#HSupID").val("0");
+ data.field.HSupID = $('#HSupID').val()
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = table.cache['wl-table'];
+ if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+ {
+ layer.load(3);
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/WEBSController/set_SaveMoveStockBill_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+ btn2: function () {
+ if (OperationType == 2) {
+ parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html";
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }//鍏抽棴
+ }
+ , function () {
+ location.replace('Kf_MoveStockBill_PDA_XiaBao.html?OperationType=1&HInterID=0');
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ return;
+ }
+ });
+
+ //#endregion
+
+ //#region 缂栬緫
+
+ form.on('submit(cmdModify)', function () {//缂栬緫
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏄庣粏鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ })
+ }
+ else {
+ layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+ }
+ });
+
+
+ //#endregion
+
+ //#region 鍒犻櫎
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = data[0].HMTONo
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
+
+ //#region 閫�鍑�
+
+ form.on('submit(cmdCancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+ })
+
+ //#endregion
+
+ //#endregion
+
+
+ //#region 婧愬崟閫夋嫨
+
+ form.on('submit(cmdHSourceBillNo)', function () {
+ var HSourceTitle = "";
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ if (HSourceBillType == '1402') {
+ HSourceTitle = "鍙戣揣閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '1243') {
+ HSourceTitle = "璋冩嫧鐢宠鍗�";
+ }
+ else if (HSourceBillType == '3720') {
+ HSourceTitle = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1604') {
+ HSourceTitle = "濮斿鐢ㄦ枡娓呭崟";
+ }
+ else if (HSourceBillType == '1214') {
+ HSourceTitle = "鐢熶骇鍙戞枡閫氱煡鍗�";
+ }
+ else if (HSourceBillType == '3721') {
+ HSourceTitle = "鐢熶骇澶囨枡鍗�";
+ }
+ else if (HSourceBillType == '1242') {
+ HSourceTitle = "鍑哄簱鐢宠鍗�";
+ }
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HSourceTitle + '鍒楄〃'//鏍囬
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ if ($("#HSourceBillListCtl").val() == '1') {
+ GetMeesageBySourceBillNo();
+ $("#HSourceBillListCtl").val("0"); //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+ }
+ }
+ })
+ });
+
+ //#endregion
+
+
+ //#region 鎵弿婧愬崟鏉＄爜
+
+ //鎵弿婧愬崟鏉＄爜
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
+ //婧愬崟鎸夐挳
+ form.on('submit(HSourceBillNo-BT)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var HSourceBillType = $("#HMainSourceBillType").val()
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_XiaBao_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": 0, "HOWNERID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '1');
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵弿鏉＄爜
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ });
+
+ //鏉＄爜鎸夐挳
+ form.on('submit(HBarCode-BT)', function (data) {
+ GetMeesageByBarCode();
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHName").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ }
+ var sOldBarCode = $('#HBarCode').val()
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var sHSCWHID = $("#HSCWHID").val()
+ var sHSCSPID = $("#HOutStockPlaceID").val()
+ var sHQty = $("#HQty").val()
+ var sSourceBillNo = $("#HSourceBillNo").val()
+ var sSourceBillType = $("#HMainSourceBillType").val()
+
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+ else {
+ $('#HBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound_OK();
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ var sBarCode = $('#HBarCode').val()
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ return;
+ }
+ if (sBarCode != "") {
+ $('#HBarCode').val("");
+ }
+ if (sHQty == "") {
+ sHQty = 0;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_AddSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceID").val("0");
+ if (result.data.hSPFlagField == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
+ $("#HOutStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceID").val(result.data.hSPIDField);
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.hDeptNameField);
+ $("#HDeptID").val(result.data.hDeptIDField);
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '2');//璺宠浆椤电
+ return;//缁撴潫
+ }
+ else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (result.data.hSourceBillTypeField == "1402") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1243") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "3720") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1604") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '濮斿鐢ㄦ枡娓呭崟' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1214") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇鍙戞枡閫氱煡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "3721") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鐢熶骇澶囨枡鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else if (result.data.hSourceBillTypeField == "1242") {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍑哄簱鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ else {
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '-1' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+ }
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //璋冨叆璋冨嚭缁勭粐涓庣櫥鍏ョ粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != HStockOrgID) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != HStockOrgID) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ //鐗╂枡鏉＄爜
+ else {
+ if (HSourceFlag == true) {
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ else {
+ HSourceFlag = true;
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ $("#HMainSourceBillType").empty();
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+ $("#HMainSourceBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HMainSourceBillType").attr("disabled", "disabled");
+
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ $("#HStockStyle").val(result.data.hStockStyleField);
+ $("#HStockStyle").attr("disabled", "disabled");
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+ $("#HStockInOrgID").attr("disabled", "disabled");
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+ $("#HStockOutOrgID").attr("disabled", "disabled");
+ $("#HBillSubType").val("ZJDB01_SYS"); //鏍囧噯鐩存帴璋冩嫧鍗�
+ $("#HBillSubType").attr("disabled", "disabled");
+ form.render('select');
+ //瀹㈡埛涓嶅彲缂栬緫
+ $("#HSupName").attr("disabled", "disabled");
+ $('#HSupID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //璋冨叆璋冨嚭缁勭粐涓庣晫闈㈡墍閫夌粍缁囦笉鍚屾椂锛屾竻绌鸿皟鍏ヨ皟鍑轰粨搴撲粨浣嶆暟鎹�
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ }
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+
+ element.tabChange('tab-Kf_MoveStockBill_PDA_XiaBao', '3');
+ }
+ }
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ }
+
+ //#endregion
+
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ 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: 'left', sort: true, width: 120, event: '鐗╂枡浠ｇ爜', 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: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data.Materlist;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
+
+ //鏉＄爜淇℃伅
+ $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+ if ($("#HBarCode_B").val() == '') {
+ $("#HMaterName_B").val("");
+ $("#HMaterModel_B").val("");
+ $("#HBatchNo_B").val("");
+ $("#HUnitName_B").val("");
+ $("#HQty_B").val("");
+ $("#HTMQty_B").val("");
+ $("#HWHName_B").val("");
+ $("#HSPName_B").val("");
+ $("#HSCWHName_B").val("");
+ $("#HSCSPName_B").val("");
+ }
+ else {
+ $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+ $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+ $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+ $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+ $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+ $("#HSCWHName_B").val(result.data.BarCodeDetailslist[0].HSCWHName);
+ $("#HSCSPName_B").val(result.data.BarCodeDetailslist[0].HSCSPName);
+ }
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鏁伴噺', title: '婧愬崟鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鏉＄爜淇℃伅
+ $("#HBarCode_B").val("");
+ $("#HMaterName_B").val("");
+ $("#HMaterModel_B").val("");
+ $("#HBatchNo_B").val("");
+ $("#HUnitName_B").val("");
+ $("#HQty_B").val("");
+ $("#HTMQty_B").val("");
+ $("#HWHName_B").val("");
+ $("#HSPName_B").val("");
+ $("#HSCWHName_B").val("");
+ $("#HSCSPName_B").val("");
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冩嫧绫诲瀷
+ form.on('select(HStockStyle)', function (data) {
+ if ($("#HStockStyle").val() == '璺ㄧ粍缁囪皟鎷�') {
+ $("#HStockInOrgID").attr("disabled", false);
+ form.render('select');
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ else {
+ $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HStockInOrgID").attr("disabled", true);
+ form.render('select');
+ if (HStockInOrgID != $('#HStockInOrgID').val()) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ }
+ }
+ });
+
+ //#endregion
+
+
+ //#region 閫夋嫨璋冨叆缁勭粐
+ form.on('select(HStockInOrgID)', function (data) {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ //娓呯┖璋冨叆浠撳簱浠撲綅鏁版嵁
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HWHName").select();
+ $("#HWHName").focus();
+ });
+
+ //#endregion
+
+
+
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撳簱淇℃伅
+ function GetHSCWHNAMEValue(obj)
+ {
+ if (obj.length > 0) {
+ $("#HSCWHName").val(obj[0].HName);
+ $("#HSCWHID").val(obj[0].HItemID);
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceID").val("0");
+ if (obj[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撲綅淇℃伅
+ function GetHOutStockPlaceIDValue(obj) {
+ if (obj.length > 0) {
+ $("#HOutStockPlaceName").val(obj[0].HName);
+ $("#HOutStockPlaceID").val(obj[0].HItemID);
+ $("#HSCWHName").val(obj[0].HWhName);
+ $("#HSCWHID").val(obj[0].HWHID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撳簱淇℃伅
+ function GetHWHValue(obj) {
+ if (obj.length > 0) {
+ $("#HWHName").val(obj[0].HName);
+ $("#HWHID").val(obj[0].HItemID);
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceID").val("0");
+ if (obj[0].HSPFlag == 0) {
+ $("#HStockPlaceName").attr("disabled", "disabled");
+ $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撲綅淇℃伅
+ function GetHSpValue(obj) {
+ if (obj.length > 0) {
+ $("#HStockPlaceName").val(obj[0].HName);
+ $("#HStockPlaceID").val(obj[0].HItemID);
+ $("#HWHName").val(obj[0].HWhName);
+ $("#HWHID").val(obj[0].HWHID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖淇濈淇℃伅
+ function GetHKeeperValue(obj) {
+ if (obj.length > 0) {
+ $("#HKeeperName").val(obj[0].HName);
+ $("#HKeeperID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖楠屾敹淇℃伅
+ function GetHSecManagerValue(obj) {
+ if (obj.length > 0) {
+ $("#HSecManagerName").val(obj[0].HName);
+ $("#HSecManagerID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖閮ㄩ棬淇℃伅
+ function GetHDeptNameValue(obj) {
+ if (obj.length > 0) {
+ $("#HDeptName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖瀹㈡埛淇℃伅
+ function GetHSupValue(obj) {
+ if (obj.length > 0) {
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖婧愬崟鍗曞彿
+ function GetHSourceBillValue(obj) {
+ if (obj.length > 0) {
+ $("#HSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HSourceBillListCtl").val("1");
+ }
+ }
+
+ //鍗曟嵁涓婁紶鍓嶅垽鏂�
+ function AllowLoadData(sSubStr) {
+ if (HInterID == 0) {
+ layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (HBillNo == '') {
+ layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr.length == 0) {
+ layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
+ else {
+ var s = 0;
+ for (var i = 0; i <= sSubStr.length - 1; i++) {
+ if (sSubStr[i].鏁伴噺 > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("娌℃湁鎵弿鐗╂枡鏉＄爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ return true;
+ }
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 3c710da..edcba28 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -43,125 +43,32 @@
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <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 class="FastMenu" carousel-item=""></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 style="margin-left: 15px; padding-top: 15px; height: 28px; ">
+ <a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu">蹇嵎鏂瑰紡涓�</a>
+ <!--<a style="margin-left: 20px;">璁剧疆鍥炬爣</a>-->
+ <button type="button" style="margin-left: 20px;" value="0" id="HIcon" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon">寮�鍚浘鏍囪缃�</button>
+ </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 class="FastMenu" carousel-item=""></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>
</div>
</div>
</div>
- </div>
<div class="layui-col-md6">
<!-- 蹇嵎鏂瑰紡 -->
<div class="layui-card">
- <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+ <div style="margin-left: 15px; padding-top: 15px; height: 28px; ">
+ <a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html?id=FastMenu_1">蹇嵎鏂瑰紡浜�</a>
+ <button type="button" style="margin-left: 20px;" value="0" id="HIcon_2" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HIcon_2">寮�鍚浘鏍囪缃�</button>
+ </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="">
- <ul class="layui-row layui-col-space10 layui-this">
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-console"></i>
- <cite>澶栬喘鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-engine"></i>
- <cite>濮斿鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-template-1"></i>
- <cite>浜у搧鍏ュ簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-chart"></i>
- <cite>棰嗘枡鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-unlink"></i>
- <cite>濮斿鍑哄簱</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-chat"></i>
- <cite>閿�鍞嚭搴�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-component"></i>
- <cite>璋冩嫧鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-app"></i>
- <cite>鏉＄爜鐢熸垚</cite>
- </a>
- </li>
- </ul>
- <ul class="layui-row layui-col-space10">
- <li class="layui-col-xs3">
- <a href="../浠撳瓨绠＄悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-template"></i>
- <cite>涓婃灦褰掕繕鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
- <i class="layui-icon layui-icon-snowflake"></i>
- <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
- <i class="layui-icon layui-icon-transfer"></i>
- <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
- <i class="layui-icon layui-icon-light"></i>
- <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/Kf_QCStockInCheckBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-senior"></i>
- <cite>鏉ユ枡妫�楠屽崟</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-cellphone"></i>
- <cite>鐢熶骇鎷嗙鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
- <i class="layui-icon layui-icon-dollar"></i>
- <cite>鐢熶骇姹囨姤鍗�</cite>
- </a>
- </li>
- <li class="layui-col-xs3">
- <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame">
- <i class="layui-icon layui-icon-survey"></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 class="FastMenu_1" carousel-item=""></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>
</div>
</div>
@@ -286,30 +193,123 @@
//椤甸潰鍒濆鍖栨柟娉�
function set_ClearBill() {
- get_Display();
+ get_Display("FastMenu");
+ get_Display("FastMenu_1");
get_Notices();
getNeedCheckRouting();
}
//椤甸潰鍏跺畠鏂规硶
- function get_Display() {
+ function get_Display(HModelAtributos) {
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
$.ajax({
url: GetWEBURL() + "/Web/Xt_UserFastMenu_Init",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType, "HModelAtributos": HModelAtributos },
success: function (data) {
console.log(data.data);
- FastMenu(data.data);
+ FastMenu(data.data, HModelAtributos);
},
error: function (data) {
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
});
}
+ $('.FastMenu').on('click', 'ul li', function (event) {
+ // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮�
+ console.log('List item clicked:', $(this).text());
- function FastMenu(data) {
+ var HIcon = $("#HIcon").val();
+
+ if (HIcon == "1") {
+ openICON("FastMenu")
+ return false;
+ }
+ });
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓婚') {
+ var linterid = data.HInterID.toString();
+ var HEntryID = data.HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍏憡'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../绯荤粺绠＄悊/鍏憡/GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ }
+ })
+ }
+ });
+
+ $('.FastMenu_1').on('click', 'ul li', function (event) {
+ // 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮�
+ console.log('List item clicked:', $(this).text());
+
+ var HIcon = $("#HIcon_2").val();
+
+ if (HIcon == "1") {
+ openICON("FastMenu_1")
+ return false;
+ }
+ });
+
+
+ //璁剧疆鍥炬爣
+ function openICON(HModelAtributos) {
+ // 鎵撳紑鍥炬爣璁剧疆瀛愮獥鍙�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "蹇嵎鏂瑰紡-鍥炬爣璁剧疆" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["30%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: '../绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html?HItemID=' + event.target.id
+ , btn: ["纭畾"]
+ , btn1: function (index, laero) {
+ //鍒锋柊蹇嵎鏂瑰紡
+ get_Display(HModelAtributos);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ form.on('submit(HIcon)', function (data) {
+ var HIcon = $("#HIcon").val();
+
+ if (HIcon == "0") {
+ $("#HIcon").val("1");
+ $("#HIcon").text("鍏抽棴鍥炬爣璁剧疆");
+ }
+ if (HIcon == "1") {
+ $("#HIcon").val("0");
+ $("#HIcon").text("寮�鍚浘鏍囪缃�");
+ }
+ })
+
+ form.on('submit(HIcon_2)', function (data) {
+ var HIcon = $("#HIcon_2").val();
+
+ if (HIcon == "0") {
+ $("#HIcon_2").val("1");
+ $("#HIcon_2").text("鍏抽棴鍥炬爣璁剧疆");
+ }
+ if (HIcon == "1") {
+ $("#HIcon_2").val("0");
+ $("#HIcon_2").text("寮�鍚浘鏍囪缃�");
+ }
+ })
+
+
+ function FastMenu(data, HModelAtributos) {
var liStr = '';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
@@ -322,6 +322,8 @@
HTranslationText = data[i].HTranslationText_English;
} else if (sessionStorage["HTranSlate"] == "3") {
HTranslationText = data[i].HTranslationText_Spain;
+ } else {
+ HTranslationText = data[i].HCaption;
}
if (i == 0) {
@@ -350,25 +352,8 @@
liStr += '</ul>';
}
};
- if (data.length % 8 == 0) {
- liStr += '<ul class="layui-row layui-col-space10">';
- liStr += '<li class="layui-col-xs3">';
- liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
- liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
- liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
- liStr += '</a>';
- liStr += '</li>';
- liStr += '</ul>';
- } else {
- liStr += '<li class="layui-col-xs3">';
- liStr += '<a lay-href="绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">';
- liStr += '<i class="layui-icon layui-icon-add-circle"></i>';
- liStr += '<cite>蹇嵎鏂瑰紡鑷畾涔�</cite>';
- liStr += '</a>';
- liStr += '</li>';
- liStr += '</ul>';
- }
- $(".FastMenu").html(liStr);
+
+ $("." + HModelAtributos).html(liStr);
element.init();
//for (var i = 0; i < data.length; i++) {
@@ -419,6 +404,13 @@
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
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 7ceb063..03eca5e 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -159,6 +159,12 @@
<cite style="white-space:pre-wrap">ERP鍙婃椂搴撳瓨鏌ヨ</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">涓撶敤璋冩嫧</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
@@ -360,6 +366,12 @@
<cite style="white-space:pre-wrap">瀹㈡埛鏉＄爜鎵爜璁板綍鍗�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA_XiaBao.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">涓撶敤璋冩嫧缂撳瓨</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index cfcbe73..e2412ed 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -10,8 +10,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all">
- <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>
- <script language="JavaScript">//灞忚斀鍚庨��鎸夐挳
+ <!--<script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script>-->
+ <script src="../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../layuiadmin/layui/layui.js"></script>
+ <script src="../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../layuiadmin/PubCustom.js"></script>
+ <script src="../layuiadmin/Scripts/json2.js"></script>
+ <script language="JavaScript">
+ //灞忚斀鍚庨��鎸夐挳
history.pushState(null, null, document.URL);
window.addEventListener('popstate', function () {
history.pushState(null, null, document.URL);
@@ -20,7 +27,21 @@
<script>
/^http(s*):\/\//.test(location.href) || alert('璇峰厛閮ㄧ讲鍒� localhost 涓嬪啀璁块棶');
</script>
-
+ <style>
+ /* 閫夐」鍩虹鏍峰紡 */
+ .aa {
+ padding: 0 20px;
+ line-height: 36px;
+ cursor: pointer;
+ transition: all 0.3s;
+ color: #000 !important; /* 寮哄埗榛戣壊瀛椾綋 */
+ }
+ /* 鎮仠鐘舵�� */
+ .aa:hover {
+ background-color: #f8f8f8 !important;
+ color: #000 !important;
+ }
+ </style>
</head>
<body class="layui-layout-body">
@@ -45,7 +66,18 @@
</a>
</li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
- <input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">
+ <!--<input type="text" placeholder="鎼滅储..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd=">-->
+ <div class="layui-form" style="margin-top: 5px; color: black;">
+ <!--<select name="HModePage" id="HModePage" lay-filter="HModePage" lay-search>
+ </select>-->
+ <input type="text" class="layui-input" name="HModePage" lay-verify="HModePage" id="HModePage" placeholder="鎼滅储..." autocomplete="off">
+ <!-- 涓嬫媺瀹瑰櫒 -->
+ <div id="dropdownMenu1" class="layui-anim layui-anim-upbit"
+ style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
+ <ul id="optionList1" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+ </div>
+ </div>
+
</li>
<li class="layui-nav-item" lay-unselect style="color: black;">
<span>鐧诲綍缁勭粐锛�</span>
@@ -168,10 +200,6 @@
</div>
</div>
- <script src="../layuiadmin/layui/layui.js"></script>
- <script src="../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>
- <script src="../layuiadmin/PubCustom.js"></script>
<script>
// 瀵艰埅鑿滃崟鐨勯棿闅斿儚绱�
var menuCell = 5;
@@ -181,10 +209,12 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$;
+ var $ = layui.$
+ , form = layui.form;
var element = layui.element;
var $ = layui.jquery;
-
+ //鎵�鏈夋ā鍧楃殑闆嗗悎
+ var PageModelList = [];
var HType = "PC"; //鐧诲綍骞冲彴锛歅C绔�佹墜鏈虹
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -198,10 +228,103 @@
set_sideMenuDisPlay();
//#endregion
+ ModePage();
+
//鑿滃崟鏍忓懡鍚�
setMenuLabel();
+
+ //#region 鎹熷潖鎯呭喌 鐐瑰嚮浜嬩欢
+
+ // 鍒嗙鐒︾偣浜嬩欢鍜岃緭鍏ヤ簨浠�
+ $('#HModePage').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」
+ renderOptions1('');
+ $('#dropdownMenu1').show();
+ }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」
+ var inputVal = $(this).val().trim();
+ renderOptions1(inputVal);
+ $('#dropdownMenu1').show();
+ });
+
+ // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺
+ $(document).on('click', function (e) {
+ if (!$(e.target).closest('#HModePage, #dropdownMenu1').length) {
+ $('#dropdownMenu1').hide();
+ }
+ });
+
+
+ // 娓叉煋閫夐」锛堟敮鎸佹樉绀哄叏閮級
+ function renderOptions1(filterText) {
+ var LimitData = [];
+ if (filterText == "") {
+ for (var i = 0; i < 10; i++) {
+ LimitData.push(PageModelList[i])
+ }
+ }
+
+ var filteredData = filterText ?
+ PageModelList.filter(function (item) {
+ return item.HName.toLowerCase().includes(filterText.toLowerCase());
+ }) :
+ LimitData; // 鏃犺繃婊ゆ枃鏈椂鏄剧ず鍏ㄩ儴
+
+ var DataMdel = [];
+ for (var i = 0; i < 10; i++) {
+ if (i < filteredData.length && filteredData.length != 0) {
+ DataMdel.push(filteredData[i]);
+ }
+ }
+
+ var html = '';
+ if (DataMdel.length > 0) {
+ DataMdel.forEach(function (item) {
+ html += `<li class="layui-nav-item aa" data-value="${item.Hurl}">${item.HName}</li>`;
+ });
+ } else {
+ html = '<li class="layui-nav-item aa">鏃犲尮閰嶇粨鏋滐紙鍙嚜鐢辫緭鍏ワ級</li>';
+ }
+
+ $('#optionList1').html(html);
+ }
+
+ // 閫夐」鐐瑰嚮浜嬩欢
+ $('#optionList1').on('click', 'li', function (data) {
+ if (!$(this).text().includes('鏃犲尮閰嶇粨鏋�')) {
+ var selectedText = $(this).text();
+ $('#HModePage').val(selectedText).trigger('input');
+ var value = data.target.dataset.value
+ if (selectedText != "") {
+ layui.index.openTabsPage(value, selectedText);
+ }
+ }
+ $('#dropdownMenu1').hide();
+ });
+ //#endregion
+
+ form.on('select(HModePage)', function (data) {
+ var keyword = data.elem[data.elem.selectedIndex].text;
+ if (data.value != "") {
+ layui.index.openTabsPage(data.value, keyword);
+ }
+ });
+
//#region 椤甸潰鍏跺畠鏂规硶
+ //鑾峰彇妯″潡椤甸潰
+ function ModePage() {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/ModePageList",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.Gy_Menu;
+ PageModelList = data;
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//鏄剧ず渚ц竟鑿滃崟
function set_sideMenuDisPlay() {
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index f8a6523..c51ad35 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -285,7 +285,7 @@
getBaseInfo(login_data2.HTranSlate);
- if (login_data == null) {
+ if (login_data == null || login_data2.HTranSlate == undefined) {
initFunction(1, "login", 1);
} else {
initFunction(1, "login", login_data2.HTranSlate);
@@ -372,7 +372,7 @@
var data2 = JSON.parse(data);
$("#LAY-user-login-username").val(data2["UserID"]);
$("#Organization").val(data2["OrgID"]);
- $("#HTranSlate").val(data2["HTranSlate"]);
+ $("#HTranSlate").val(data2["HTranSlate"] == undefined ? 1 : data2["HTranSlate"]);
form.render('select');
}
}
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 9a2d54d..ef6f3c2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -202,7 +202,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+ var OptionData = [];
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -1780,7 +1780,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: [get_MessageError('[0000-2-051]纭畾', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]鍙栨秷', sessionStorage["HTranSlate"])]
, btn1: function (index, layero) {
@@ -1805,8 +1805,16 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
-
- }
+ if (OptionData.length > 0) {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HEmpID": OptionData[0].HItemID
+ , "HEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HEmpName": OptionData[0].鑱屽憳鍚嶇О
+ })
+ OptionData = [];
+ }
+ }
});
}
//鐝粍浠ｇ爜
@@ -1958,6 +1966,12 @@
});
+
+ //鎿嶄綔鍛�
+ function GetHEmpValue(obj) {
+ OptionData = obj;
+ }
+
</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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
index 6c99be9..a517fba 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/Add_Edit_Gy_Department.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/Add_Edit_Gy_Department.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +35,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +44,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -71,7 +74,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -96,27 +99,89 @@
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HEmpID" id="HEmpID" value="0">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-tab-item">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏉″舰鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏄惁鐢熶骇杞﹂棿锛�</label>
+ <div class="layui-input-inline">
+ <select name="HWorkShopFlag" id="HWorkShopFlag" lay-verify="HWorkShopFlag">
+ <option value="true">鏄�</option>
+ <option value="false">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬浜烘暟锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEmpQtys" id="HEmpQtys" autocomplete="off" value="0">
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏉″舰鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
</div>
- <input id="HItemID" name="HItemID" type="hidden" />
- <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
</div>
</div>
+ </div>
</div>
</div>
</form>
@@ -173,6 +238,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -239,6 +319,11 @@
set_SaveBill(data);
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//#endregion
@@ -284,6 +369,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Department/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -317,6 +403,14 @@
//, "HCreateDate": data.鍒涘缓鏃ユ湡
//, "HUpDater": data.淇敼浜�
//, "HUpDateDate": data.淇敼鏃ユ湡
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
+ , "HEmpQtys": data["閮ㄩ棬浜烘暟"]
+ , "HWorkShopFlag": (data["鏄惁鐢熶骇杞﹂棿"]+"")
});
layer.close(ajaxLoad);
} else {
@@ -330,6 +424,31 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Department/AuditGy_Department',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -383,7 +502,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?HType=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -414,6 +533,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PreventErrMould.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/Add_Edit_Gy_PreventErrMould.html"
index 7a020cd..753e8aa 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/Add_Edit_Gy_PreventErrMould.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/Add_Edit_Gy_PreventErrMould.html"
@@ -274,7 +274,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#HStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
- layui.form.render('checkbox');s
+ layui.form.render('checkbox');
Organ();
}
//鏃犳簮鍗曟柊澧�
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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
index 6ffbfe6..4eecdb8 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/Add_Edit_Gy_Unit.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/Add_Edit_Gy_Unit.html"
@@ -20,19 +20,20 @@
<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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
+
</div>
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
<h1 style="text-align:center;"><b>璁￠噺鍗曚綅</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -62,7 +63,7 @@
<div class="layui-col-xs4">
<label class="layui-form-label">鎹㈢畻姣斿垪锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input" value="1">
</div>
</div>
@@ -74,9 +75,19 @@
</div>
</div>
<div class="layui-col-xs4">
+ <label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
+ <div class="layui-input-inline">
+ <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float: left; width: 150px;">
+ <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
<label class="layui-form-label"> 绂佺敤鏍囧織:</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -95,6 +106,54 @@
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -109,6 +168,9 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
@@ -126,7 +188,7 @@
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ /*var hID = params[params[0]];//缂栬緫鏌ョ湅*/
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -138,6 +200,14 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -179,6 +249,14 @@
, "HStandard": data.榛樿鏍囪
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
+ , "HUnitGroupID": data.HUnitGroupID
+ , "HUnitGroupName": data.璁￠噺鍗曚綅缁勫悕绉�
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
});
} else {
@@ -198,14 +276,28 @@
var shijian = year + "-" + month + "-" + day;
//鍒ゆ柇鏄惁鏂板
- if (hID == 1) {
+ if (OperationType == 1) {
//id new
$("#HItemID").val(0);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HItemID").val(hID);//淇敼鏃朵富琛↖D
RoadBillMain(hID);
-
/* RoadBillSub(linterid);*/
}
//绂佺敤鏍囧織
@@ -218,83 +310,32 @@
$("#HStandard").val(data.elem.checked);
});
- //閫夋嫨浜у搧寮圭獥
- form.on('submit(HMateria-BT)', function () {//浜у搧
+ //閫夋嫨璁￠噺鍗曚綅缁�
+ form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
- //閫夋嫨宸ュ簭
- form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
- }
- })
- });
-
- //閫夋嫨渚涘簲鍟�
- form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '渚涘簲鍟嗗垪琛�'
+ , area: ['90%', '90%']//澶у皬
+ , title: '璁￠噺鍗曚綅缁勫垪琛�'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitGroup.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
}
- })
- });
-
- //閫夋嫨閮ㄩ棬
- form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '閮ㄩ棬鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitGroupName").val(checkStatus.data[0].璁￠噺鍗曚綅缁�);
+ $("#HUnitGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
- })
- });
- //閫夋嫨鍗曚綅
- form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
- layer.open({
- type: 2
- , area: ['666px', '666px']
- , title: '鍗曚綅鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
+ , btn2: function (index, layero) { }
})
});
@@ -358,12 +399,16 @@
form.on('submit(Exit)', function (data) {//閫�鍑�
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
form.on('submit(Cancel)', function () {
//sessionStorage["SourceFlag"] = false;
if (hID == null || hID == 0) {
- parent.location.href = "../../../views/index.html"
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
}
else {
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
@@ -389,6 +434,10 @@
layer.msg("璇疯緭鍏ユ崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (!(/^(0(\.\d+)?|([1-9]\d*)(\.\d+)?)$/.test($("#HRate").val()) && parseFloat($("#HRate").val()) > 0)) {
+ layer.msg("璇疯緭鍏ュぇ浜�0鐨勬崲绠楁瘮渚嬶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
var HRate = $("#HRate").val();
sMainStr += ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate;
@@ -403,6 +452,17 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#HItemID").val(data.data);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ set_CheckBillNoLayer();
+ }
+ else {
+ layer.close(index);
+ }
+ });
}
else {
f_alert(data.Message);
@@ -433,6 +493,52 @@
}
});
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ //瀹℃牳鏃犲脊妗�
+ function set_CheckBillNoLayer() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Unit/AuditGy_Unit',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "Type": 1, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("瀹℃牳鎴愬姛", { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ }
});
//瀹氫箟鍏ㄥ眬鍙橀噺
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/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 75b9a13..2c15334 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/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -13,6 +13,8 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -34,6 +36,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
@@ -42,6 +45,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -83,7 +87,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">浠撳簱绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HWarehouseType" id="HWarehouseType" lay-verify="required" >
+ <select name="HWarehouseType" id="HWarehouseType" lay-verify="required">
<option value="鐢熶骇浠撳簱" selected="selected">鐢熶骇浠撳簱</option>
<option value="妯″叿浠撳簱">妯″叿浠撳簱</option>
</select>
@@ -95,7 +99,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囪</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" value="false" name="HStopflag" id="HStopflag">
</div>
</div>
@@ -146,6 +150,53 @@
</div>
</div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
</div>
<input id="HItemID" name="HItemID" type="hidden" value="0" />
<input id="HBarCode" name="HBarCode" type="hidden" value="0" />
@@ -208,6 +259,21 @@
$("#HItemID").val(0);
//绂佺敤缁勭粐閫夐」
$("#HUSEORGID").attr("disabled", true);
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMakeEmp").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HCheckEmp").val('');
+ $("#HCheckDate").val('');
+ $("#HStopEmp").val('');
+ $("#HStopDate").val('');
}
else if (OperationType == 3) {//缂栬緫
//绂佺敤缁勭粐閫夐」
@@ -289,7 +355,10 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
@@ -334,6 +403,7 @@
$.ajax({
url: GetWEBURL() + "Gy_Warehouse/cx",
type: "GET",
+ async: false,
data: {
"HInterID": linterid
},
@@ -385,6 +455,12 @@
//, "HMaker": data.HMaker
//, "HCreateDate": data.鍒涘缓鏃ユ湡
, "HUpDater": sessionStorage["HUserName"]
+ , "HMakeEmp": data["鍒涘缓浜�"]
+ , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+ , "HCheckEmp": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+ , "HStopEmp": data["绂佺敤浜�"]
+ , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
//, "HUpDateDate": data.淇敼鏃ユ湡
});
layer.close(ajaxLoad);
@@ -399,6 +475,32 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Warehouse/AuditGy_Warehouse',
+ type: "GET",
+ data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -450,7 +552,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -481,6 +583,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").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/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkStationList.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/Add_Edit_Gy_WorkStationList.html"
index eccab37..ced410a 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/Add_Edit_Gy_WorkStationList.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/Add_Edit_Gy_WorkStationList.html"
@@ -35,58 +35,115 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綅浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
- <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綅浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+ <input type="hidden" name="HUSEORGID" id="HUSEORGID" value="">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綅鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囪</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒涘缓缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
+ <input id="HParentID" name="HParentID" type="hidden" value="0" />
+ <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
+ <input id="HShortNumber" name="HShortNumber" type="hidden" />
</div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸ヤ綅鍚嶇О</label>
- <div class="layui-input-inline">
- <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍔╄鐮侊細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">绂佺敤鏍囪</label>
- <div class="layui-input-inline">
- <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
- <input type="hidden" value="false" name="HStopflag" id="HStopflag">
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐</label>
- <div class="layui-input-inline">
- <input type="text" name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID" autocomplete="off" placeholder="" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
- </div>
- </div>
- </div>
- </div>
- <input id="HItemID" name="HItemID" type="hidden" value="0" />
- <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
- <input id="HParentID" name="HParentID" type="hidden" value="0" />
- <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
- <input id="HShortNumber" name="HShortNumber" type="hidden" />
+
+
+ </div>
+
</form>
</div>
</div>
@@ -134,6 +191,16 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
$("#HItemID").val(0);
+ $("#HMakeEmp").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ $("#HMakeEmp").val(sessionStorage["HMaker"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+ $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -151,7 +218,6 @@
}
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
$("#HCREATEORGID").val(sessionStorage["OrganizationID"])
- $('#HMakeTime').val(Format(new Date(), "yyyy-MM-dd"))
//#endregion
@@ -176,11 +242,42 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_WorkStation/AuditGy_WorkStation", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
function get_LoginIs() {
@@ -199,6 +296,7 @@
$.ajax({
url: GetWEBURL() + "Gy_WorkStationBill/cx",
type: "GET",
+ async:false,
data: {
"HInterID": linterid
},
@@ -217,6 +315,12 @@
, "HHelpCode": data.鍔╄鐮�
, "HRemark": data.澶囨敞
, "HCREATEORGID": data.鍒涘缓缁勭粐
+ , "HMakeEmp": data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�
+ , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd")
+ , "HStopEmp": data.绂佺敤浜�
+ , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd")
+ , "HCheckEmp": data.瀹℃牳浜�
+ , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
});
layer.close(ajaxLoad);
} else {
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_BadPhenomena.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_BadPhenomena.html"
index c4c7291..72211be 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_BadPhenomena.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_BadPhenomena.html"
@@ -285,6 +285,31 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓嶈壇鐜拌薄浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嶈壇鐜拌薄-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_BadPhenomena.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -362,6 +387,13 @@
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
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_CheckItem.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_CheckItem.html"
index e104b81..db5b01e 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_CheckItem.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_CheckItem.html"
@@ -309,6 +309,33 @@
};
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ TagParentId = data.ParentID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫妫�楠岄」鐩�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//浠ｇ爜鍥炶溅鏂规硶
$('#HNumber').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -387,6 +414,13 @@
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
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 a58dc12..2a4b849 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"
@@ -308,6 +308,30 @@
});
})
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍚姩妫�鏌ラ」鐩唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍚姩妫�鏌ラ」鐩�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckNoteItem.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -374,6 +398,13 @@
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
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_ConkType.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_ConkType.html"
index 6aea22f..a09b965 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_ConkType.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_ConkType.html"
@@ -305,6 +305,20 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏁呴殰绫诲埆浠ｇ爜') {
+ var linterid = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏁呴殰绫诲埆鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ConkType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -368,6 +382,13 @@
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
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_Currency.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_Currency.html"
index 40b01c4..148170d 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_Currency.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_Currency.html"
@@ -231,6 +231,13 @@
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
@@ -381,6 +388,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璐у竵浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璐у竵璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ })
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
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_CusType.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_CusType.html"
index ddb0246..f04284c 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_CusType.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_CusType.html"
@@ -214,6 +214,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '瀹㈡埛鍒嗙被浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹㈡埛鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CusType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -301,6 +325,13 @@
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
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_DepartmentList.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_DepartmentList.html"
index db1c0dc..068e7f0 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_DepartmentList.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_DepartmentList.html"
@@ -148,6 +148,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -225,6 +226,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -280,6 +284,22 @@
};
});
//#endregion
+
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '閮ㄩ棬浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閮ㄩ棬鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
@@ -384,6 +404,13 @@
// 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) {
@@ -628,6 +655,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = 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_Department.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -651,7 +706,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1&&data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -683,7 +738,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 0b221a0..79bd212 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -218,8 +218,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
//鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
- addSWhereByOpenType();
- get_Display(sWhere);
+ get_FastQuery();
//#endregion
@@ -310,6 +309,31 @@
}
});
})
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鑱屽憳浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鑱屽憳璁剧疆-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -569,6 +593,12 @@
// 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) {
@@ -968,7 +998,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
var DeptName = params[params[2]];
- if (openType != "undefined") {
+ if (typeof (openType) != "undefined") {
sWhere += " and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' ";
DeptName = decodeURI(DeptName);//瀵筓RI 杩涜瑙ｇ爜
if (DeptName != "undefined") {
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_EnvironmentTestItem.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_EnvironmentTestItem.html"
index 85eafbb..b857e1e 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_EnvironmentTestItem.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_EnvironmentTestItem.html"
@@ -391,8 +391,12 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '妫�娴嬩唬鐮�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妫�娴嬩唬鐮�' });
+ } 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) {
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_MaintainLev.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_MaintainLev.html"
index ed7ddda..8a86d0d 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_MaintainLev.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_MaintainLev.html"
@@ -283,6 +283,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '淇濆吇绾у埆浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫淇濆吇绾у埆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MaintainLev.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -372,6 +396,13 @@
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
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_MaterType.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_MaterType.html"
index 44d8b2f..0aab23e 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_MaterType.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_MaterType.html"
@@ -8,7 +8,17 @@
<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/layui/layui1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -24,13 +34,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍒嗙被鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
@@ -76,7 +86,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent" >
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
<div class="layui-row" style="margin-top:5px">
@@ -136,23 +146,33 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;"></div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+
<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="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></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="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></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="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>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><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="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -167,7 +187,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','tree'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -177,8 +197,12 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , tree = layui.tree;
var sWhere = "";
-
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "Gy_MaterType";
+ var sql = "";
+ var HMaterTypeID = 0; //鐗╂枡鍒嗙被鑺傜偣id
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
@@ -207,6 +231,34 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //瓒呴摼鎺�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鐗╂枡鍒嗙被浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -218,6 +270,9 @@
break;
case 'btn-Edit':
set_ShowBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
break;
case 'btn-Delete':
set_DeleteBill();
@@ -260,7 +315,11 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -295,8 +354,11 @@
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鍒濆鍖栨爲褰㈠浘
+ get_Display_Tree()
+
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
Organ();
}
//#endregion
@@ -329,31 +391,31 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 800
+ , height: 'full-80'
, page: true
, limits: [50, 500, 5000, 20000]
, limit: 50
, cellMinWidth: 90
, cols: [[
- { type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- , { field: '浠ｇ爜', title: '浠ｇ爜' }
- , { field: '鍚嶇О', title: '鍚嶇О' }
- , { field: '鐭唬鐮�', title: '鐭唬鐮�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
- , { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
- , { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
- , { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
- , { field: '绂佺敤浜�', title: '绂佺敤浜�' }
- , { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
- , { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
+ //{ type: 'checkbox', fixed: 'left' }
+ //, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ //, { field: '浠ｇ爜', title: '浠ｇ爜' }
+ //, { field: '鍚嶇О', title: '鍚嶇О' }
+ //, { field: '鐭唬鐮�', title: '鐭唬鐮�' }
+ //, { field: '绛夌骇', title: '绛夌骇' }
+ //, { field: '鏈骇鏍囧織', title: '鏈骇鏍囧織' }
+ //, { field: '绂佺敤鏍囧織', title: '绂佺敤鏍囧織' }
+ //, { field: '澶囨敞', title: '澶囨敞' }
+ //, { field: '浣跨敤鐘舵��', title: '浣跨敤鐘舵��' }
+ //, { field: '鍒涘缓浜�', title: '鍒涘缓浜�' }
+ //, { field: '寤虹珛鏃堕棿', title: '寤虹珛鏃堕棿' }
+ //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ //, { field: '瀹℃牳鏃堕棿', title: '瀹℃牳鏃堕棿' }
+ //, { field: '淇敼浜�', title: '淇敼浜�' }
+ //, { field: '淇敼鏃堕棿', title: '淇敼鏃堕棿' }
+ //, { field: '绂佺敤浜�', title: '绂佺敤浜�' }
+ //, { field: '绂佺敤鏃堕棿', title: '绂佺敤鏃堕棿' }
+ //, { field: '浣跨敤缁勭粐', title: '浣跨敤缁勭粐' }
]]
};
}
@@ -363,7 +425,7 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
- $("#HOrgName").val(sessionStorage["OrganizationName"]);
+ $("#HOrgName").val(sessionStorage["Organization"]);
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0"); $("#ColContent2").val("");
@@ -390,11 +452,54 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data
+ var data = [];
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ 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 if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
+ } 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: false, 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: false, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+
ins = table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒锋柊鎸夐挳鏄剧ず
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
@@ -493,12 +598,15 @@
sWhere += " and " + ColName2 + " " + com2;
}
if (HNumber) {
- sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鍚嶇О like '%" + HName + "%'";
+ sWhere += " and 鐗╂枡鍒嗙被鍚嶇О like '%" + HName + "%'";
}
-
+ //鐗╂枡鑺傜偣sql
+ if (sql != "") {
+ sWhere += sql;
+ }
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -528,7 +636,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -559,7 +667,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -632,13 +740,41 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
}
})
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗-鐗╂枡鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
@@ -718,132 +854,11 @@
//#endregion
+
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
- }
- //#endregion
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , 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 - 2; i++) {
- if (dataCol[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
@@ -864,6 +879,95 @@
form.render('select');
}
//#endregion
+
+ // 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeTreeListByLevel',
+ type: "GET",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HParentID=0 ";
+ HMaterTypeID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HMaterTypeID = 0;
+ } else {
+ sql = " and HParentID='" + data.id + "' ";
+ HMaterTypeID = data.id;
+ }
+ get_FastQuery()
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
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_MaterTypeEdit.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_MaterTypeEdit.html"
index 1057507..db0cbb0 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_MaterTypeEdit.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_MaterTypeEdit.html"
@@ -9,6 +9,9 @@
<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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -47,6 +50,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鐗╂枡鍒嗙被</b></h1>
<div class="layui-tab-content">
@@ -87,7 +91,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤鐘舵�侊細</label>
<div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" disabled>
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
@@ -97,7 +101,7 @@
<div class="layui-inline">
<label class="layui-form-label">浣跨敤缁勭粐锛�*</label>
<div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" disabled>
</select>
</div>
</div>
@@ -112,14 +116,78 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤" disabled>
<input type="hidden" name="UnitType" id="UnitType">
</div>
</div>
</div>
</div>
</div>
+ <!--鍏朵粬淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
</div>
</div>
</div>
@@ -149,22 +217,46 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //鑾峰彇 閫掑叆鍙傛暟
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var hID = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
//鍒濆鍖栫晫闈�
set_ClearBill();
- if (hID == null || hID == 0) {
+ if (OperationType==1) {
//id new
$("#HItemID").val(0);
- }
- else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else if (OperationType == 2) {//澶嶅埗
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(hID);
+ $("#HItemID").val(0);
+ $("#HNumber").val('');
+ $("#HName").val('');
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val('');
+ $("#HUpDateDate").val('');
+ $("#HChecker").val('');
+ $("#HCheckDate").val('');
+ $("#HCloseMan").val('');
+ $("#HCloseDate").val('');
+ }else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
$("#HItemID").val(hID);
//淇敼鏃朵富琛↖D
RoadBillMain(hID);
+
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//#endregion
@@ -215,27 +307,28 @@
/*var sWhere = " and HParentID=0 ";*/
var sWhere = "";
if (hID != "" && hID != null) {
- sWhere += " and HItemID!=" + hID;
+ sWhere += " and HItemID!=" + hID + " and 瀹℃牳浜�!='' and 绂佺敤鏍囧織=0 ";
}
$.ajax({
url: GetWEBURL() + '/Gy_MaterType/Gy_MaterTypeList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
var Parent = '<option style="color:blue;" value="0">鏃�</option>';
if (data1.count == 1) {
var data = data1.data;
for (var i = 0; i < data.length; i++) {
- Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鍚嶇О + '</option>';
+ Parent += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].鐗╂枡鍒嗙被鍚嶇О + '</option>';
}
$("#HParentID").append(Parent);
form.render('select');
} else {
- layer.close(ajaxLoad);
+
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(ajaxLoad);
+
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
@@ -305,6 +398,7 @@
$.ajax({
url: GetWEBURL() + "Gy_MaterType/Gy_MaterTypeList",
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -312,14 +406,23 @@
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HItemID": data.HItemID
- , "HNumber": data.浠ｇ爜
- , "HName": data.鍚嶇О
+ , "HNumber": data.鐗╂枡鍒嗙被浠ｇ爜
+ , "HName": data.鐗╂枡鍒嗙被鍚嶇О
, "HHelpCode": data.HHelpCode
, "HParentID": data.HParentID
, "HUseFlag": data.浣跨敤鐘舵��
, "HUSEORGID": data.HUSEORGID
, "HRemark": data.澶囨敞
, "HStopflag": data.绂佺敤鏍囧織
+ , "HMaker": data["鍒涘缓浜�"]
+ , "HMakeDate": data["寤虹珛鏃堕棿"] == null ? "" : Format(new Date(data["寤虹珛鏃堕棿"]), "yyyy-MM-dd")
+ , "HUpDater": data["淇敼浜�"]
+ , "HUpDateDate": data["淇敼鏃堕棿"] == null ? "" : Format(new Date(data["淇敼鏃堕棿"]), "yyyy-MM-dd")
+ , "HChecker": data["瀹℃牳浜�"]
+ , "HCheckDate": data["瀹℃牳鏃堕棿"] == null ? "" : Format(new Date(data["瀹℃牳鏃堕棿"]), "yyyy-MM-dd")
+ , "HCloseMan": data["绂佺敤浜�"]
+ , "HCloseDate": data["绂佺敤鏃堕棿"] == null ? "" : Format(new Date(data["绂佺敤鏃堕棿"]), "yyyy-MM-dd")
+
});
$("#HParentID").val(data.HParentID);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 529c02b..4a99690 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -463,6 +463,26 @@
table.render(option);
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐗╂枡浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐗╂枡璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=3"
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -701,6 +721,13 @@
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
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_OrderBackInfo.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_OrderBackInfo.html"
index c86a9b3..c0bfda4 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_OrderBackInfo.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_OrderBackInfo.html"
@@ -154,7 +154,33 @@
get_FastQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍙嶉鐘舵�佷唬鐮�') {
+ var hID = data.HItemID.toString();
+ TagParentId = 0;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['55%', '55%']
+ , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#endregion
@@ -295,6 +321,13 @@
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
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_OrderLev.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_OrderLev.html"
index 4c99cf8..774c8ae 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_OrderLev.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_OrderLev.html"
@@ -159,6 +159,34 @@
get_FastQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璁㈠崟绛夌骇浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ TagParentId = 0;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['55%', '55%']
+ , title: '缂栬緫璁㈠崟绛夌骇'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -339,6 +367,13 @@
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
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_PackType.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_PackType.html"
index bb146f3..cc85f52 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_PackType.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_PackType.html"
@@ -199,6 +199,20 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍖呰鏂瑰紡浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PackType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -267,6 +281,13 @@
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
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_PreventErrMould.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_PreventErrMould.html"
index bfab982..8e33120 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_PreventErrMould.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_PreventErrMould.html"
@@ -287,6 +287,31 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '闃查敊瑁呯疆浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫闃查敊瑁呯疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PreventErrMould.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -374,6 +399,13 @@
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
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_ProjectMoney.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_ProjectMoney.html"
index ac1661c..5bd7a18 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_ProjectMoney.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_ProjectMoney.html"
@@ -281,6 +281,29 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '椤圭洰璐圭敤浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫椤圭洰璐圭敤'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -370,6 +393,13 @@
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
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_ProjectMoneyClass.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_ProjectMoneyClass.html"
index aeadd9d..156d1dc 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_ProjectMoneyClass.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_ProjectMoneyClass.html"
@@ -304,6 +304,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '椤圭洰璐圭敤鍒嗙被浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫-椤圭洰璐圭敤鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoneyClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -384,6 +408,13 @@
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
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 e275bb0..1eb2d5c 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"
@@ -366,6 +366,33 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ TagParentId = data.ParentID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫妫�楠岄」鐩被鍒�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//浠ｇ爜鍥炶溅鏂规硶
$('#HNumber').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -534,6 +561,13 @@
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
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_SupType.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_SupType.html"
index 29b9bef..335ad35 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_SupType.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_SupType.html"
@@ -214,6 +214,31 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '渚涘簲鍟嗗垎绫讳唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫渚涘簲鍟嗗垎绫�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_SupType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -301,6 +326,13 @@
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
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_TechnologyParameterList.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_TechnologyParameterList.html"
index 35c3e8a..11f4f79 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_TechnologyParameterList.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_TechnologyParameterList.html"
@@ -307,6 +307,26 @@
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宸ヨ壓鍙傛暟浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓鍙傛暟-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_TechnologyParameter_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
@@ -500,6 +520,13 @@
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
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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
index 01d9858..3dab3ac 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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
@@ -216,6 +216,25 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璁剧疆-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnit_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -316,6 +335,13 @@
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
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_TemporaryArea.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_TemporaryArea.html"
index 7500d47..b017c12 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_TemporaryArea.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_TemporaryArea.html"
@@ -172,6 +172,27 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏆傛斁鍖轰唬鐮�') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏆傛斁鍖�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_TemporaryArea.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ window.location.reload();
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -254,6 +275,13 @@
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
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_Unit.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_Unit.html"
index cba7ddc..0cd70a5 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_Unit.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_Unit.html"
@@ -9,7 +9,7 @@
<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/HideButton_New.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -44,15 +44,16 @@
<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-inline">
- <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -80,14 +81,69 @@
<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;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" 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="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;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" 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="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="CheckBill"><i class="layui-icon layui-icon-circle"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AbandonCheck"><i class="layui-icon layui-icon-radio"></i>鍙嶅鏍�</button>
@@ -112,6 +168,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/layui/zgqlayui.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -131,6 +188,7 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"]
+ var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var HModName = "Gy_Unit";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HParentID"];
@@ -143,7 +201,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "璁￠噺鍗曚綅鍒楄〃";
@@ -184,8 +242,6 @@
set_InitGrid();
//鏌ヨ
get_FastQuery()
- //杩囨护鏂规鏌ヨ
- get_DefaultModule();
}
//#endregion
@@ -237,6 +293,13 @@
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
@@ -261,17 +324,17 @@
, limit: 50
, cellMinWidth: 90
}
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
ins = table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
+ Display_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName option").length < 1) {
ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -292,6 +355,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -309,7 +375,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=3&linterid=' + hID
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -324,7 +390,7 @@
case 'set_DeleteBill':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�=="") {
var ItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
@@ -352,7 +418,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
break;
//瀹℃牳鎸夐挳
@@ -377,7 +443,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -387,9 +453,7 @@
break;
//鎸夐挳璁剧疆
case 'set_HideButton':
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_Unit";
- get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ get_HideButton(set_HideButton_ID, HModName, HModName, sessionStorage["HUserName"]);//绗簩涓弬鏁板簲涓築illType鍩虹璧勬枡绫诲瀷鏃燘illType鐢∕odname琛ㄧず
break;
};
});
@@ -399,6 +463,26 @@
set_ResCnz();
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璁￠噺鍗曚綅浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璁￠噺鍗曚綅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?OperationType=2&linterid=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -418,7 +502,7 @@
break;
}
-
+
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
@@ -435,7 +519,7 @@
table.render(option);
});
-
+
function btnrowDouble(obj) {
var index = parent.layer.getFrameIndex(window.name);
var data = obj.data;
@@ -507,7 +591,33 @@
}
//#endregion
-
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = 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_Unit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 蹇�熻繃婊�
@@ -517,6 +627,12 @@
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) {
@@ -538,6 +654,48 @@
}
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 (HNumber) {
sWhere += " and 璁￠噺鍗曚綅浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -556,6 +714,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -565,124 +729,6 @@
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
-
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , 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 - 2; 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 鐐瑰嚮琛岄�変腑楂樹寒
@@ -787,7 +833,11 @@
}
}
$("#ColName").empty();
+ $("#ColName1").empty();
+ $("#ColName2").empty();
$("#ColName").append(Organization);
+ $("#ColName1").append(Organization);
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -818,7 +868,7 @@
if (HOrgName != "undefined") {
Organization = HOrgName.toString();
}
-
+
}
return addSWhere;
}
@@ -888,7 +938,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index 7a3e98a..fa97079 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -49,15 +49,17 @@
<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-inline">
- <label class="layui-form-label">浠撳簱浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber2" id="HNumber2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -148,6 +150,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -225,6 +228,9 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -287,6 +293,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -371,6 +383,23 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠撳簱浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
+
function btnrowDouble(obj) {
var index = parent.layer.getFrameIndex(window.name);
var data = obj.data;
@@ -449,6 +478,13 @@
// 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) {
@@ -682,6 +718,34 @@
}
//#endregion
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = 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_Warehouse.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -706,7 +770,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==="") {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -739,7 +803,7 @@
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
index 6265a1e..c336792 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter.html"
@@ -471,9 +471,13 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
- } else if (data[i].name == '宸ヤ綔涓績浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ヤ綔涓績浠ｇ爜'});
- } else {
+ } 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':
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index b7d828a..d78e3fc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -43,6 +43,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -161,6 +162,9 @@
</div>
</div>
</div>
+
+ </div>
+ <div class="layui-tab-item">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
@@ -202,8 +206,7 @@
</div>
</div>
</div>
- </div>
- </div>
+ </div>
<input type="hidden" value="0" name="HParentID" id="HParentID">
</div>
</div>
@@ -538,7 +541,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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_WorkStationList.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_WorkStationList.html"
index c4ead8c..96b323f 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_WorkStationList.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_WorkStationList.html"
@@ -15,7 +15,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -78,12 +78,69 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -151,13 +208,47 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '宸ヤ綅浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkStationList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
case 'set_AddNew': set_AddNew();
break;
-
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -199,7 +290,7 @@
case 'get_Exit': Pub_Close(2);
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumn();
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
};
});
@@ -212,6 +303,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
@@ -284,6 +381,12 @@
// 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) {
@@ -309,10 +412,10 @@
, limit: 50
, cellMinWidth: 90
}
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
table.render(option);
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
layer.close(ajaxLoad);
if ($("#ColName option").length < 1) {
@@ -339,7 +442,12 @@
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) {
@@ -361,6 +469,48 @@
}
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 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 宸ヤ綅浠ｇ爜 like '%" + HNumber + "%'";
}
@@ -377,10 +527,69 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
sWhere = "";
}
//#endregion
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_WorkStation_Query";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ //(鍙傛暟涓�锛氳〃鏍糹d)
+ table.exportFile('mainTable', option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = 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_WorkStationList.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 鏂板
function set_AddNew() {
@@ -419,7 +628,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var ItemID = data[0].HItemID.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -452,7 +661,7 @@
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -559,128 +768,6 @@
}
//#endregion
- //#region 闅愯棌鍒楄缃�
- function get_HideColumn() {
- var colName = "";
- var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- colName += option.cols[0][i]["title"] + ",";
- }
- var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
- var urlLen = urlStr.split('/');
- for (var i = 0; i < urlLen.length - 4; i++) {
- contentUrl += "../";
- }
- colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "闅愯棌鍒楄缃�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: [contentUrl, "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "Gy_WorkStation";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
- //鍒锋柊琛ㄦ牸鏁版嵁
- 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 - 2; 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>';
@@ -691,6 +778,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
index cd6bcc7..07e2822 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ConkReasonList.html"
@@ -296,6 +296,31 @@
parent.layer.close(index);
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏁呴殰鍘熷洜浠ｇ爜') {
+ var hID = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫涓嶈壇鍘熷洜'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_ConkReasonEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#endregion
@@ -357,6 +382,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html"
index 26fdc0f..469c3cc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemClassList.html"
@@ -201,6 +201,31 @@
};
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐐规椤圭洰鍒嗙被浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规椤圭洰鍒嗙被'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckItemClassEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
@@ -311,6 +336,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
index bdfa193..6ab8e47 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckItemMethodList.html"
@@ -221,6 +221,31 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐐规鏂规硶浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规鏂规硶'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -310,6 +335,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
index debab41..6e9215a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -306,6 +306,31 @@
};
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐐规椤圭洰浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐐规椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_DotCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
@@ -429,6 +454,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatus.html"
index 06af196..2cf0de3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatus.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipStatus.html"
@@ -170,6 +170,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璁惧鐘舵��'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_EquipStatusEdit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -231,6 +255,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html"
index 67f0ad4..c7213f4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainClass.html"
@@ -400,10 +400,12 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
})
- } else if (data[i].id == '鍗曟嵁鍙�') {
+ } else if (data[i].name == '淇濆吇椤圭洰鍒嗙被浠ｇ爜') {//娣诲姞瓒呴摼鎺�
col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
- })
+ 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) {
@@ -457,6 +459,21 @@
}
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '淇濆吇椤圭洰鍒嗙被浠ｇ爜') {
+ var linterid = data.HItemID;
+ var linteridSub = data.hsubid;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '淇濆吇椤圭洰鍒嗙被-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍩虹璧勬枡/Gy_MaintainClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ })
+ }
+ });
+
//瀵煎叆
function set_SouceExcel() {
layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
index 1d24e4b..ff57c25 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaintainList.html"
@@ -311,6 +311,32 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '淇濆吇椤圭洰浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫淇濆吇椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_MaintainEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -413,6 +439,13 @@
// 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) {
@@ -678,7 +711,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '缂栬緫鍣ㄥ叿棰嗙敤鍗�'
+ , title: '缂栬緫淇濆吇椤圭洰'
, closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
index f631049..95de7ab 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
@@ -164,6 +164,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍣ㄥ叿鐘舵��'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_MouldStatusEdit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -231,6 +255,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckClass.html"
index a5c18b7..d633287 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckClass.html"
@@ -306,6 +306,23 @@
$("#btnSearch").click();
set_ClearQuery();
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁翠慨楠屾敹椤圭洰鍒嗙被浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ var linteridSub = data.hsubid;
+
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁翠慨楠屾敹椤圭洰鍒嗙被-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍩虹璧勬枡/Gy_RepairCheckClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ })
+ }
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -405,6 +422,13 @@
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
})
}
+ 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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
index ce2a45e..3cf191e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairCheckList.html"
@@ -311,6 +311,32 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁翠慨楠屾敹椤圭洰浠ｇ爜') {
+ var hID = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫缁翠慨妫�楠岄」鐩�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_RepairCheckEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -412,6 +438,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html"
index 2e1b2a4..69b86c0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairClass.html"
@@ -308,6 +308,21 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁翠慨椤圭洰鍒嗙被浠ｇ爜') {
+ var linterid = data.HItemID;
+ var linteridSub = data.hsubid;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁翠慨椤圭洰鍒嗙被-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍩虹璧勬枡/Gy_RepairClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ })
+ }
+ });
+
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -400,10 +415,12 @@
col.push({
field: data[i].id, title: data[i].name, align: 'center', sort: true, totalrow: true, width: 200
})
- } else if (data[i].id == '鍗曟嵁鍙�') {
+ } else if (data[i].name == '缁翠慨椤圭洰鍒嗙被浠ｇ爜') {//娣诲姞瓒呴摼鎺�
col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
- })
+ 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) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
index 57333d0..4cdedc1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairList.html"
@@ -313,6 +313,32 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁翠慨椤圭洰浠ｇ爜') {
+ var hID = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫缁翠慨椤圭洰'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_RepairEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -430,6 +456,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 2a1ecd5..d04aaad 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -491,7 +491,11 @@
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '鐝粍浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐝粍浠ｇ爜' });
+ 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) {
@@ -537,7 +541,7 @@
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#ColName").find('option').length == 0) {
ColFilter();
}
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index bdd04c4..74a1aff 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -505,7 +505,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -531,7 +531,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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_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/Add_Edit_Gy_Post.html"
index 53aad68..9adb333 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_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/Add_Edit_Gy_Post.html"
@@ -25,6 +25,7 @@
<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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -58,46 +59,48 @@
</div>
</div>
</div>
+
<div class="layui-form-item">
+
<div class="layui-inline">
- <label class="layui-form-label" >浣跨敤缁勭粐锛�</label>
- <div class="layui-input-inline">
- <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
- </select>
+ <label class="layui-form-label" style="width: 120px"> 澶囨敞锛�</label>
+ <div class="layui-input-inline" style="width: 550px">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒涘缓缁勭粐锛�</label>
- <div class="layui-input-inline">
- <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" >浣跨敤鐘舵�侊細</label>
- <div class="layui-input-inline">
- <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag" readonly>
- <option value="鏈娴�" selected>鏈娴�</option>
- <option value="鏈娇鐢�">鏈娇鐢�</option>
- <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
- </select>
- </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>-->
<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 class="layui-inline">
+ <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>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+ </select>
+ </div>
+ </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" readonly>
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
</div>
</div>
</div>
@@ -249,7 +252,10 @@
Pub_Close(1);
}
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -265,6 +271,34 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_Post", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HUSEORGID").attr("disabled", true);
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_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/Add_Edit_Gy_PostSkillList.html"
index b5fd8db..0535bc3 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_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/Add_Edit_Gy_PostSkillList.html"
@@ -25,6 +25,7 @@
<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 class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -257,6 +258,10 @@
}
});
});
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//閫�鍑�
form.on('submit(Exit)', function (data) {//
if (linterid == undefined) {
@@ -297,6 +302,34 @@
//#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_PostSkill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -375,7 +408,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鍛樺伐琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -403,7 +436,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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 75e9425..7cc9871 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"
@@ -36,6 +36,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -445,6 +446,7 @@
</div>
<script>
+ var OptionData = [];
//#region 鎶樺彔娉ㄩ噴
//#endregion
layui.config({
@@ -534,7 +536,10 @@
form.on('submit(Cancel)', function () {
Pub_Close(1);
})
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//鏄惁绂佺敤鎸夐挳
form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
@@ -678,6 +683,34 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Process/AuditGy_Process", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
function get_LoginIs() {
@@ -944,7 +977,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -995,7 +1028,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ユ鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1020,7 +1053,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1033,6 +1066,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Fst").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Fst").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1045,7 +1085,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1058,6 +1098,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Proc").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Proc").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1070,7 +1117,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠屾柟妗堝垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html', 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1083,6 +1130,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HQCSchemeName_Patrol").val(OptionData[0].妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID_Patrol").val(OptionData[0].hmainid);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1133,6 +1187,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HBadWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HBadWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1158,6 +1219,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWasterWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWasterWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1183,6 +1251,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HBadCountDevelopWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HBadCountDevelopWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1208,6 +1283,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWWBadWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWWBadWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1233,6 +1315,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWWWasterWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWWWasterWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1258,6 +1347,13 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ , end: function (index, layero) {
+ if (OptionData.length > 0) {
+ $("#HWHName").val(OptionData[0].浠撳簱鍚嶇О);
+ $("#HWHID").val(OptionData[0].HItemID);
+ }
+ OptionData = [];
+ }
})
}
//#endregion
@@ -1319,6 +1415,14 @@
$("#HDeptID").val(obj[0].HItemID);
$("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
}
+ //鏂规杩斿洖
+ function GetCheckProjectValue(obj) {
+ OptionData = obj;
+ }
+ //杞﹂棿
+ function GetHWHValue(obj) {
+ OptionData = obj;
+ }
</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_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index cf7861d..4fcccbf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -36,6 +36,7 @@
<div class="layui-btn-group">
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -43,6 +44,7 @@
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
<li>鍏朵粬淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -253,7 +255,7 @@
<div class="layui-input-inline">
<input type="text" name="HCubicleQty" id="HCubicleQty" value="1" lay-verify="" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -263,6 +265,9 @@
</div>
</div>
</div>
+
+ </div>
+ <div class="layui-tab-item">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
@@ -306,7 +311,6 @@
</div>
</div>
</div>
- </div>
</div>
</form>
</div>
@@ -383,6 +387,10 @@
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
+ if ($("#HCheckEmp").val() != "") {
+ $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//
+ }
+
}
else if (OperationType == 4) {//娴忚
$("#HItemID").val(linterid);//
@@ -484,7 +492,10 @@
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
});
-
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
//琛ㄥご淇℃伅璐熻矗浜哄脊绐�
form.on('submit(HEmpID-BT)', function () {
@@ -605,6 +616,34 @@
});
}
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
@@ -728,7 +767,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -754,7 +793,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -780,7 +819,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -830,7 +869,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Type=&Type2=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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_BadReason.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_BadReason.html"
index 5306894..3a72db7 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_BadReason.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_BadReason.html"
@@ -302,6 +302,31 @@
}
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓嶈壇鍘熷洜浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫涓嶈壇鍘熷洜'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//鍚嶇О鍥炶溅鏂规硶
$('#HName').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -394,6 +419,13 @@
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
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_BadResult.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_BadResult.html"
index efac181..d38a781 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_BadResult.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_BadResult.html"
@@ -277,6 +277,32 @@
break;
};
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓嶈壇鍚庢灉浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫涓嶈壇鍚庢灉'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadResult.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -399,6 +425,13 @@
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
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_BadType.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_BadType.html"
index 39ec14c..c89665f 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_BadType.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_BadType.html"
@@ -283,6 +283,32 @@
break;
};
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓嶈壇绫诲瀷浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫涓嶈壇绫诲瀷'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -405,6 +431,13 @@
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
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 2d5a9d6..36db509 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"
@@ -331,6 +331,30 @@
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宀椾綅浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宀椾綅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Post.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -379,6 +403,13 @@
for (var i = 0; i < data.length; i++) {
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) {
@@ -673,7 +704,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -702,7 +733,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/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 46e3a51..49f2568 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"
@@ -274,6 +274,31 @@
break;
};
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宀椾綅鎶�鑳戒唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宀椾綅鎶�鑳�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_PostSkillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -367,6 +392,13 @@
// 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) {
@@ -668,7 +700,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HItemID = data[0].HItemID.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
@@ -697,7 +729,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -803,10 +835,15 @@
//鑾峰彇鍙傛暟
var params = get_UrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HProcID = params[params[1]];//瀵瑰簲宸ュ簭
+ var result = ""
if (typeof (openType) != "undefined") {
- return " and 绂佺敤鏍囧織 != '鏄�' and ISNULL(瀹℃牳浜�,'') != '' ";
+ result += " and 绂佺敤鏍囧織 != '鏄�' and ISNULL(瀹℃牳浜�,'') != '' ";
+ if (typeof (HProcID) != "undefined" && HProcID != "0") {
+ result += " and HProcID=" + HProcID
+ }
}
- return "";
+ return result;
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/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"
index ff8760b..bf0039f 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_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"
@@ -266,7 +266,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
get_DefaultModule();
}
@@ -394,6 +394,7 @@
if (HName) {
sWhere += " and 宸ユ鍚嶇О like '%" + HName + "%'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -922,6 +923,19 @@
})
}
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var addWhere = "";
+ if (typeof (openType) != "undefined") {
+ addWhere += " and 瀹℃牳浜� != '' and 绂佺敤鏍囪!='Y'";
+ }
+ return addWhere;
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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 0e9f1ec..403a4a7 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"
@@ -478,9 +478,12 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
} else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
- } else if (data[i].name == '宸ュ簭浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '宸ュ簭浠ｇ爜' });
-
+ } 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
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_ScrapReasonList.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_ScrapReasonList.html"
index 0158e32..bce1d50 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_ScrapReasonList.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_ScrapReasonList.html"
@@ -209,6 +209,20 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鎶ュ簾鍘熷洜浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鎶ュ簾鍘熷洜-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_ScrapReason.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -318,6 +332,13 @@
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
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_ShiftsList.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_ShiftsList.html"
index dabe1f5..efbedce 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_ShiftsList.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_ShiftsList.html"
@@ -375,6 +375,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐝浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐝-缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍩虹璧勬枡/Gy_ShiftsEdit.html?OperationType=2&HItemID=' + hID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btn_Search").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
@@ -879,6 +899,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 00984e6..8f84f25 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -472,7 +472,11 @@
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
} else if (data[i].name == '鐢熶骇璧勬簮浠ｇ爜') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '鐢熶骇璧勬簮浠ｇ爜' });
+ 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
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_WorkShiftEdit.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_WorkShiftEdit.html"
index 209e9e6..9269946 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_WorkShiftEdit.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_WorkShiftEdit.html"
@@ -18,6 +18,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style>
.layui-form-item .layui-inline {
margin-top: 5px;
@@ -38,6 +39,7 @@
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
</div>
<div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -259,6 +261,7 @@
, form = layui.form
, element = layui.element;
var HInterID = $('#HInterID').val();
+ var HModName = "Gy_WorkShifEdit"
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
//#endregion
@@ -292,6 +295,8 @@
});
get_InitGrid();
+ //璁剧疆琛ㄦ牸鏍煎紡
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
} else if (OperationType == 2) {
//淇敼鏃朵富琛↖D
@@ -306,12 +311,14 @@
$("#HStopTime").val("");
$("#HCheckTime").val("");
$("#HItemID").val(0);
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
get_InitGrid();
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
+ DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -422,7 +429,7 @@
, area: ['90%', '90%']//澶у皬
, title: "宸ヤ綔涓績鍒楄〃" //鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?Htype=2", "yes"]
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -451,7 +458,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Htype=2&Organization=' + sessionStorage["Organization"], 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -533,7 +540,7 @@
break;
//鍒楄缃�
case 'set_HideColumn':
- get_HideColumn();
+ get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
break;
//涓婁竴琛�
case 'btn_up':
@@ -684,11 +691,45 @@
//#endregion
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(data);
+ });
+
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
Pub_Close(1);
});
//#endregion
+
+ //瀹℃牳
+ function set_CheckBill() {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var HInterID = $("#HItemID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_ShiftsController/AuditGy_Shifts", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//#region 瀛愯〃鍒濆鍖�
function get_InitGrid() {
@@ -700,7 +741,7 @@
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { type: 'numbers',field:'搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'HSNO', title: '搴忓彿', edit: 'text', totalRow: true }
, { field: 'HStartDate', title: '寮�濮嬫椂闂�', event: "HStartDate" }
, { field: 'HEndDate', title: '缁撴潫鏃堕棿', event: "HEndDate" }
@@ -753,7 +794,7 @@
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
console.log("绱㈠紩涓�:" + rowIndex);
- if (rowIndex === '0') {
+ if (rowIndex === '0' && option.data.length===1) {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
var oldData = table.cache["mainTable"];
@@ -796,6 +837,11 @@
$("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(obj[0].HItemID);
}
+ function GetWorkCenterValue(obj) //杩斿洖宸ヤ綔涓績
+ {
+ $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ $("#HWorkCenterID").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_WorkShiftList.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_WorkShiftList.html"
index 8dc7711..277d278 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_WorkShiftList.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_WorkShiftList.html"
@@ -231,6 +231,8 @@
set_StockOrg();
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -281,6 +283,26 @@
});
})
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐝浠ｇ爜') {
+ var HInterID = data.HInterID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐝-缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
+ // 鎸夐挳1 鐨勫洖璋�
+ ,end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btn_Search").trigger('click');
+ }
+ })
+ }
+ });
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -376,9 +398,8 @@
, title: '鐝-鏂板'
, shift: 0 //寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=1&HInterID='
- , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- end: function (index, layero, that) {
+ ,end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btn_Search").trigger('click');
}
@@ -398,9 +419,8 @@
, title: '鐝-缂栬緫'
, shift: 0 //寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
- , btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
- end: function (index, layero, that) {
+ ,end: function (index, layero, that) {
//鍒锋柊椤甸潰
$("#btn_Search").trigger('click');
}
@@ -415,7 +435,7 @@
function btn_Delete() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].瀹℃牳浜�==='') {
var HInterID = data[0].HInterID.toString();
layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -445,7 +465,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
//#endregion
@@ -736,6 +756,13 @@
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
@@ -852,7 +879,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //get_FastQuery();
form.render("select");
}
},
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index d4cb2dd..b03540c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -310,6 +310,23 @@
set_ClearQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '渚涘簲鍟嗕唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗗熀纭�璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + hID]
+ , resize: false
+ })
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
if (page != 1) {
@@ -513,6 +530,13 @@
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
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index f4a058e..0ee8db4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -330,6 +330,23 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '瀹㈡埛浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛鍩虹璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['Gy_Customer_Edit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=']
+ , resize: false
+ })
+ }
+ });
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
if (page != 1) {
@@ -558,6 +575,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
index ec993fb..acc9c5d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
@@ -55,6 +55,7 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" lay-verify="HInnerBillNo">
</div>
</div>
<div class="layui-inline">
@@ -115,19 +116,6 @@
</button>
</div>
</div>
-
- </div>
- <div class="layui-row">
- <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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" 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;">
@@ -138,10 +126,28 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍐呴儴璁㈠崟鍙�</label>
+ <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="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
+ <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel">
</div>
</div>
</div>
@@ -884,7 +890,8 @@
$("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
-
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//
table.render(option);
layer.closeAll();
}
@@ -905,7 +912,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2&HProcID=' + $("#HProcID").val(), 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1179,21 +1186,40 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HPostSkillid": checkStatus.data[0].HItemID
, "HPostSkillNumber": checkStatus.data[0].宀椾綅鎶�鑳戒唬鐮�
, "HPostSkillName": checkStatus.data[0].宀椾綅鎶�鑳藉悕绉�
-
+
})
+ layer.close(index);//鍏抽棴寮圭獥
} else {
- layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].宀椾綅鎶�鑳戒唬鐮�, "HPostSkillName": checkStatus.data[i].宀椾綅鎶�鑳藉悕绉�, "HRemark": "", "HSkillLev": "1", "HTrainDate": Format(new Date(), "yyyy-MM-dd"), "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": "" });
+ }
+ // 閲嶆柊娓叉煋琛ㄦ牸锛屾洿鏂版暟鎹�
+ table.reload('mainTable', {
+ data: buttonArr
+ });
}
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1255,6 +1281,8 @@
function GetGyMaterial(obj) {
$("#HMaterID").val(obj.HItemID);//鐗╂枡id
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
}
//宸ュ簭
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
index ec4c4fb..e27d5ea 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
@@ -33,6 +33,17 @@
</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="HBillNo" id="HBillNo">
+ </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">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -51,25 +62,16 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <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="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
</div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
@@ -239,6 +241,35 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/鍛樺伐鎶�鑳芥竻鍗�/HR_EmployeeSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(2);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 澶村伐鍏锋爮浜嬩欢
@@ -434,6 +465,12 @@
// 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) {
@@ -567,14 +604,13 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- if (number==2) {
- if (HDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
- }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -723,7 +759,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].鐘舵��==="鍒涘缓") {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -755,7 +791,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
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 08ebdaa..22ddf1c 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"
@@ -307,6 +307,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鏄剧ず鍒楁暟鎹�
//function DisPlay_HideColumn() {
// $.ajax({
@@ -1233,6 +1253,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
index f655d21..a52c875 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
@@ -64,18 +64,6 @@
</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="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" 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">
<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>
@@ -85,16 +73,9 @@
</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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" 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">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -103,6 +84,40 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" 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" lay-verify="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" 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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" 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">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -715,7 +730,8 @@
$("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
-
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//
table.render(option);
layer.closeAll();
}
@@ -993,28 +1009,49 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkillList.html', "yes"]
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkillList.html?HType=2&HProcID=' + $("#HProcID").val(), "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("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
-
- if (checkStatus.data[0].鍏抽棴浜� == null || checkStatus.data[0].鍏抽棴浜� == "") {
+ if (checkStatus.data.length === 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HPostSkillid": checkStatus.data[0].HItemID
, "HPostSkillNumber": checkStatus.data[0].宀椾綅鎶�鑳戒唬鐮�
, "HPostSkillName": checkStatus.data[0].宀椾綅鎶�鑳藉悕绉�
-
+
})
+ layer.close(index);//鍏抽棴寮圭獥
} else {
- layer.msg("璇ヤ换鍔″凡鍏抽棴锛岃閲嶆柊閫夋嫨!");
+ //(澶氶�夎)
+ //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ if (tableBak[i]["HPostSkillid"] != 0 && tableBak[i]["HPostSkillid"] != "" && tableBak[i]["HPostSkillid"] != undefined && tableBak[i]["HPostSkillid"] != null) {
+ buttonArr.push(tableBak[i]); //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+ }
+ }
+ //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ buttonArr.push({
+ "HPostSkillid": checkStatus.data[i].HItemID, "HPostSkillNumber": checkStatus.data[i].宀椾綅鎶�鑳戒唬鐮�, "HPostSkillName": checkStatus.data[i].宀椾綅鎶�鑳藉悕绉�, "HRemark": "", "HSkillLev": "1", "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillNo": ""
+ , "HSourceBillType": "" });
+ }
+ // 閲嶆柊娓叉煋琛ㄦ牸锛屾洿鏂版暟鎹�
+ table.reload('mainTable', {
+ data: buttonArr
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+
+
+
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -1187,6 +1224,8 @@
function GetGyMaterial(obj) {
$("#HMaterID").val(obj.HItemID);//鐗╂枡id
$("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);//鐗╂枡鍚嶇О
+ $("#HMaterModel").val(obj.瑙勬牸鍨嬪彿);//鐗╂枡鍚嶇О
}
//宸ュ簭
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
index 80255eb..d8c60a1 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
@@ -33,6 +33,16 @@
</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="HBillNo" id="HBillNo">
+ </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">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
@@ -51,26 +61,30 @@
<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
</div>
- <div class="layui-row" style="margin-top:10px;margin-left:5%;">
- <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="HBillNo" id="HBillNo">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撶粍缁�-->
- </select>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- </div>
+ </div>
+
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">-->
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ <!--</select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
+ </div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<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>
@@ -107,12 +121,12 @@
<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 name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -127,19 +141,19 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" 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 name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;" class="ForFilteringSchemes">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -154,7 +168,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -239,6 +253,36 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� ''銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../宸ヨ祫绠＄悊/宀椾綅鎶�鑳芥竻鍗�/HR_PostSkillBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(2);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 澶村伐鍏锋爮浜嬩欢
@@ -386,7 +430,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_FastQuery(1);
+ get_FastQuery(2);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -432,6 +476,12 @@
// 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) {
@@ -718,7 +768,7 @@
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
+ if (checkStatus.data.length === 1 && data[0].鐘舵��==="鍒涘缓") {
var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
@@ -750,7 +800,7 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
}
}
@@ -927,7 +977,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
+ //get_FastQuery(1)
form.render("select");
}
}, error: function () {
@@ -1088,7 +1138,7 @@
}
, end: function () {
if (HIsClose_Manual != true) {
- get_FastQuery()
+ get_FastQuery(2)
form.render("select");
}
}
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
index 57be01c..2c9cdfd 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\345\215\225/Pay_PayMentBillList.html"
@@ -424,6 +424,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ祫鍗�/Pay_PayMentBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 瀵煎嚭Execel
function btn_Export() {
table.exportFile(ins.config.id, option.data, "xls");
@@ -860,6 +880,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index a26f174..6c9628f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -282,6 +282,26 @@
}
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(涓汉)/Pay_SingleBalBillEdit.html?OperationType=2&HInterID=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
@@ -1373,6 +1393,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
index 7de6e19..a6e0d6a 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\345\205\266\344\273\226\051/Pay_OtherBalBillList.html"
@@ -277,6 +277,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ祫缁撶畻鍗�(鍏朵粬)/Pay_OtherBalBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1'
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -859,6 +879,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index 1c93dd6..b6cfd26 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -635,6 +635,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�(闆嗕綋)/Pay_GroupBalBillEdit.html?OperationType=2&HInterID=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 瀵煎嚭Execel
function btn_Export() {
var data;
@@ -1387,6 +1407,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
index 1bb6b37..4427004 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\274\202\345\270\270\345\267\245\346\227\266\347\224\263\350\257\267\345\215\225/Pay_ErrWorkTimesRequestBillList.html"
@@ -303,6 +303,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../../宸ヨ祫绠＄悊/寮傚父宸ユ椂鐢宠鍗�/Pay_ErrWorkTimesRequestBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鏄剧ず鍒楁暟鎹�
//function DisPlay_HideColumn() {
// $.ajax({
@@ -1223,6 +1243,13 @@
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
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
index 7234db8..574faae 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -257,6 +257,26 @@
}
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var HInterID = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: HPageTitle + '- 缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit.html?OperationType=2&HInterID=' + HInterID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鍒濆鍖栫晫闈�
@@ -1244,6 +1264,13 @@
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
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 03db667..464a917 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -168,8 +168,12 @@
<th>淇濆吇璁″垝</th>
<td class="bz_td">
<input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
- <input type="hidden" name="HMouldMaintainPlanInterID" class="layui-input LineHeight" id="HMouldMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
- <input type="hidden" name="HMouldMaintainPlanEntryID" class="layui-input LineHeight" id="HMouldMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" value="0" readonly>
+ <input type="hidden" name="HPlanInterID" id="HPlanInterID" value="0" readonly>
+ <input type="hidden" name="HMouldMaintainPlanInterID" id="HMouldMaintainPlanInterID" value="0" readonly>
+ <input type="hidden" name="HMouldMaintainPlanEntryID" id="HMouldMaintainPlanEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0" readonly>
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" readonly>
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0" readonly>
</td>
</tr>
</tbody>
@@ -550,6 +554,13 @@
}
$("#HMouldMaintainRuleInterNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+ $("#HPlanNo").val(checkStatus.data[0].淇濆吇璁″垝鍙�);
+ $("#HPlanInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
+ $("#HMouldMaintainPlanInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
+ $("#HMouldMaintainPlanEntryID").val(checkStatus.data[0].淇濆吇璁″垝瀛恑d);
+ $("#HMainSourceBillNo").val(checkStatus.data[0].淇濆吇璁″垝鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].淇濆吇璁″垝瀛恑d);
get_DocCheckItem2();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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 6ef5129..3a863e1 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"
@@ -796,7 +796,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3819' },
+ data: { "HBillType": '3818' },
success: function (d) {
$("#HInterID").val(0);
$("#HPlanInterID").val(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_MouldMaintainRuleBillList_PDA.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_MouldMaintainRuleBillList_PDA.html"
index 9907986..5736457 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_MouldMaintainRuleBillList_PDA.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_MouldMaintainRuleBillList_PDA.html"
@@ -137,7 +137,7 @@
var option1 = [];
var option2 = [];
var HModName = "Sc_MouldMaintainRuleBillList_PDA";
- var titleData = ["HInterID","hmainid", "鍗曟嵁绫诲瀷", "閰嶄欢ID", "鍗曚綅ID", "璐熻矗浜轰唬鐮�", "琛屽叧闂汉", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "鍐呴儴鍗曟嵁鍙�", "hsubid", "淇濆吇椤圭洰ID", "璐熻矗浜篒D"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "hmainid", "鍗曟嵁绫诲瀷", "閰嶄欢ID", "鍗曚綅ID", "璐熻矗浜轰唬鐮�", "琛屽叧闂汉", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "鍐呴儴鍗曟嵁鍙�", "hsubid", "淇濆吇椤圭洰ID", "璐熻矗浜篒D", "淇濆吇璁″垝id","淇濆吇璁″垝瀛恑d"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
index f2f8249..e4356d7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_Add_NoPassProdCheckBill.html"
@@ -3694,7 +3694,7 @@
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(linterid);
- RoadBillSub(linterid);
+ //RoadBillSub(linterid);
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
index fab0512..aa36ab0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
@@ -200,21 +200,16 @@
</div>
</div>
</div>
-
- <!--<script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-</script>-->
-
-
- <script>
+</body>
+</html>
+<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
- //#region 鍏叡鍙橀噺
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -229,16 +224,17 @@
var sWhere = "";
var option = [];
- //#endregion
+ //#endregion
//#region 杩涘叆椤甸潰鍔犺浇
var HModName = "QC_NoPassProdCheckBillList";
- //#region 鍒濆鍖栫晫闈�
+ //鍒濆鍖栫晫闈�
set_ClearBill();
- //#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -293,9 +289,12 @@
get_FastQuery();
});
- //#endregion
+
- //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
@@ -325,10 +324,14 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', totalRowText: '鍚堣琛�'}
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true, totalRow: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , {
+ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: '鐢熶骇璧勬簮鍚嶇О ', title: '鐢熶骇璧勬簮鍚嶇О ', width: 115, sort: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
@@ -380,6 +383,26 @@
});
})
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嶈壇璇勫鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: ['../澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html?linterid=' + linterid, 'yes']
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
@@ -843,35 +866,9 @@
//#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
+</script>
-//鐩戝惉琛屽伐鍏蜂簨浠�
- //table.on('tool(mainTable)', function(obj){
- // var data = obj.data;
- // //console.log(obj)
- // if(obj.event == 'del'){
- // layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function(index){
- // obj.del();
- // layer.close(index);
- // });
- // } else if(obj.event == 'edit'){
- // layer.prompt({
- // formType: 2
- // ,value: data.HDate
- // }, function(value, index){
- // obj.update({
- // HDate: value
- // });
- // layer.close(index);
- // });
- // //layer.alert('鎴戞槸缂栬緫涓�');
- // }
- //});
-
-
- </script>
-
-</body>
-</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdConclusionBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdConclusionBillMainList.html"
index d584c0e..2b82b7d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdConclusionBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdConclusionBillMainList.html"
@@ -252,6 +252,25 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdConclusionBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -311,6 +330,13 @@
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
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMainList.html"
index 2010f8d..b5fb249 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMainList.html"
@@ -352,6 +352,25 @@
}
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -631,8 +650,12 @@
for (var i = 0; i < data.length; i++) {
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: '鍗曟嵁鍙�' });
+ } 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) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeCheckBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeCheckBillMainList.html"
index c8cc22f..c793063 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeCheckBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeCheckBillMainList.html"
@@ -252,6 +252,25 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -311,6 +330,13 @@
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
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMainList.html"
index eaf1b2b..6179876 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMainList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdRequestBillMainList.html"
@@ -252,6 +252,25 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdRequestBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -311,6 +330,13 @@
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
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 6141465..6ac4e16 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鐢熶骇璁″垝鎺掍骇</title>
+ <title>涓夊崌鐢熶骇璁″垝鎺掍骇</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
@@ -23,11 +23,11 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">瀹屽伐鏃ユ湡瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">浜ゆ湡瀵煎叆</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<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="btnReady" id="btnReady">鍑嗗</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
@@ -36,6 +36,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">娆犳枡杩愮畻</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>-->
@@ -302,13 +303,14 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyWorkQty"><i class="layui-icon layui-icon-delete"></i>鍑嗗(鍚屾浜ц兘)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></i>閫夋搷浣滃伐</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -348,6 +350,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: 'soulTable'
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
@@ -584,6 +587,16 @@
case 'set_ReadyAsc':
set_ReadyAsc();
break;
+ //鍑嗗鍚屾浜ц兘
+ case 'set_ReadyWorkQty':
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnReady(data);
+ layer.close(index);
+ }
+ })
+ break;
//閫変骇绾�
case 'set_Souce':
set_Souce(data);
@@ -725,7 +738,16 @@
})
}
})
-
+ //瑕佹枡杩愮畻
+ form.on('submit(btnYLYS)', function (data) {
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnYLYS();
+ layer.close(index);
+ }
+ })
+ })
//鎻愭枡杩愮畻
form.on('submit(btnTLYS)', function (data) {
if (set_ModCheck("Sc_WorkBillSortBill_tlys") == true) {
@@ -1015,10 +1037,10 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Gy_Department/list',
+ url: GetWEBURL() + '/Gy_Department/cx',
type: "GET",
async: false,
- data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ data: { "HInterID": HWorkShopID },
success: function (data1) {
if (data1.count == 1) {
$("#HWorkShopID").val(HWorkShopID);
@@ -1050,7 +1072,7 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery(1);
+ get_FastQuery(2);
get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
@@ -1659,11 +1681,12 @@
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text', filter: true, sort: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });//0
+ //0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
@@ -1677,7 +1700,7 @@
for (var i = 0; i < HArrangeProductDayQty; i++) {
columns.push(dateColumns[i]);//0
}
-
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
@@ -1692,7 +1715,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150 });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1712,7 +1735,7 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, filter: true });//0
- columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+ columns.push({ fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
elem: '#mainTable'
@@ -1722,7 +1745,32 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , even: true
+ , contextmenu: {
+ // 琛ㄦ牸鍐呭鍙抽敭鑿滃崟閰嶇疆
+ body: [
+ {
+ name: '澶嶅埗',
+ icon: 'layui-icon layui-icon-template',
+ click: function (obj) {
+ soulTable.copy(obj.text)
+ layer.msg('澶嶅埗鎴愬姛锛�')
+ }
+ },
+ {
+ name: '琛�-钃濊壊',
+ click: function (obj) {
+ obj.trElem.css('background', '#01AAED')
+ }
+ },
+ {
+ name: '绾㈣壊',
+ click: function (obj) {
+ obj.elem.css('color', 'red')
+ }
+ }
+ ]
+ }
+ , even: true//琛屾嫋鎷�
, rowDrag: {/*trigger: 'row',*/
done: function (obj) {
// 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
@@ -1751,17 +1799,17 @@
}
, done: function (res, page, count) {
soulTable.render(this);
- $('.layui-table thead').on('click', 'th', function () {
- // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
- var field = $(this).data('field');
- set_InitGrid1(field);
- sWhere = {
- HORGID: sessionStorage["OrganizationID"]
- , HBEGINDATE: field
- , HENDDATE: field
- }
- //get_Display_3(JSON.stringify(sWhere));
- });
+ //$('.layui-table thead').on('click', 'th', function () {
+ // // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
+ // var field = $(this).data('field');
+ // set_InitGrid1(field);
+ // sWhere = {
+ // HORGID: sessionStorage["OrganizationID"]
+ // , HBEGINDATE: field
+ // , HENDDATE: field
+ // }
+ // //get_Display_3(JSON.stringify(sWhere));
+ //});
//res.data.forEach(function (item, index) {
// if (data1.data.DataColor != undefined) {
// var sj = data1.data.DataColor;
@@ -1831,11 +1879,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
- }
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+ get_Display_2(HinterID_S);
}
} else {
@@ -1855,7 +1899,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": HinterID_S.toString(),"num":1 },
success: function (data1) {
if (data1.count == 1) {
@@ -1921,7 +1965,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": HinterID_S.toString(), "num": 2 },
success: function (data1) {
if (data1.count == 1) {
@@ -2367,7 +2411,33 @@
}
});
}
-
+ //瑕佹枡杩愮畻
+ function get_btnYLYS() {
+ sWhere = {
+ HProdORGID: $("#HProdORGID").val()
+ , HWorkShopID: $("#HWorkShopID").val()
+ }
+ sWhere = JSON.stringify(sWhere);
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery(2);
+ layer.msg(data1.Message);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鎻愭枡杩愮畻
function get_btnTLYS() {
if ($("#HWorkShopID").val() == 0) {
@@ -2541,10 +2611,10 @@
//鍑嗗
- function get_btnReady() {
- var data = table.cache["mainTable"];
+ function get_btnReady(data) {
+ /*var data = table.cache["mainTable"];*/
var HTotalDataList = [[]];
-
+ var ajaxData;
var index = 0;
var countEveryGroup = 50;
for (var i = 0; i < data.length; i++) {
@@ -2552,7 +2622,8 @@
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
if (isNaN(data[i]["HSourceID"])) {
- return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ data[i]["HSourceID"] = 0
+ /*return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")*/
}
if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
@@ -2572,22 +2643,26 @@
HICOMNum = HTotalDataList[t];
$.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData_SS',
async: false,
type: "GET",
data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
+ ajaxData = data1.data;
for (var i = 0; i < data1.data.length; i++) {
for (var j = 0; j < option.data.length; j++) {
if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
+ option.data[j]["HSourceID"] = data1.data[i]["HSourceID"];
+ option.data[j]["鐢熶骇璧勬簮"] = data1.data[i]["鐢熶骇璧勬簮"];
option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
+
break;
}
}
@@ -2637,10 +2712,10 @@
}
table.render(option);
- set_Priority();
- data = table.cache["mainTable"];
- for (var i = 0; i < data.length; i++) {
- if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ /*set_Priority();*/
+ /*data = table.cache["mainTable"];*/
+ for (var i = 0; i < ajaxData.length; i++) {
+ if (parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == null || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == undefined) {
msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
}
@@ -3618,7 +3693,8 @@
if (num >= data.length) {
break;
}
- if (option.data[i]["LAY_CHECKED"] == true) {
+ if ($.grep(data, function (item) {
+ return item.hmainid === option.data[i].hmainid;}).length > 0) {
option.data[i]["HSourceID"] = OptionData[0].HItemID;
option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
num += 1;
@@ -4136,7 +4212,6 @@
, limit: 200
, cellMinWidth: 90
}
- table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn_ICMO();
@@ -4385,6 +4460,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -4455,9 +4531,9 @@
option2.cols[0][i + 1]["fixed"] = "left";
}
}
- table.render(option2);
+ /*table.render(option2);*/
} else {
- table.render(option2);
+ /*table.render(option2);*/
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -4564,20 +4640,6 @@
})
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 2; i < option.cols[0].length - 1; 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);$("#ColName1").empty();
- $("#ColName1").append(Organization);$("#ColName2").empty();
- $("#ColName2").append(Organization);
- form.render('select');
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
index cadd3c7..10a2573 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatFormImport_SS.html"
@@ -230,16 +230,16 @@
}
var HDataSub = [];
-
+ var index = layer.load();
+ layer.msg("寮�濮嬪鍏�");
//JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
- for (var i = 0; i < option.data.length; i += 300) {
+ for (var i = 0; i < option.data.length; i += 100) {
HDataSub = option.data.slice(i, i + 100)
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(HDataSub);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
- var index = layer.load();
$.ajax({
type: "POST",
@@ -263,7 +263,8 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- }
+ }
+ layer.close(index);
}
//琛屽唴鍒犻櫎
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
index cd4ed16..5836dda 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Cg_PODemandPlanConfigBillReportForLack.html"
@@ -140,6 +140,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>蹇嵎鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -189,6 +190,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //蹇嵎鏂板
+ case 'get_insert':
+ get_insert();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -485,7 +490,18 @@
}
}
}
- table.exportFile(ins.config.id, option.data, "xls");
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -493,6 +509,48 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ //#endregion
+
+ //#region 蹇嵎鏂板
+ function get_insert() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (set_ModCheck("Cg_PODemandPlanConfigBill_Edit") == false) {
+ return layer.msg("鏃犳潈闄�!")
+ }
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var ajaxLoad = layer.load();
+ var message = "";
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ var sql = "exec h_p_Cg_PODemandPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HSupID
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ message += i + "." + data1.data[0].Remark + CheckStatus.data[i].鐗╂枡鍚嶇О + "\\n"
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ layer.alert(message, { icon: 5 });
+ layer.close(ajaxLoad);
+ //鍒锋柊鏁版嵁
+ get_FastQuery(2);
+ }
+ })
+ }
}
//#endregion
@@ -657,6 +715,26 @@
form.render('select');
}
//#endregion
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
});
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
index 17a4349..dec49ac 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/Gy_RoutingBillReportForLack.html"
@@ -134,6 +134,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Copy" id="get_Copy"><i class="layui-icon layui-icon-refresh-3"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -183,6 +184,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //瀵煎嚭excel
+ case 'get_Copy':
+ get_Copy();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -314,7 +319,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -462,7 +467,19 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- table.exportFile(ins.config.id, option.data, "xls");
+ var data = option.data;
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id,data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -473,6 +490,31 @@
}
//#endregion
+ //澶嶅埗
+ function get_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HMaterID = data[0].HMaterID;
+ var HMaterNumber = data[0].鐗╂枡浠ｇ爜;
+ var HMaterName = data[0].鐗╂枡鍚嶇О;
+ var HMaterModel = data[0].瑙勬牸鍨嬪彿;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + 0 + '&HSouceBillType=4610&HMaterID=' + HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_NeedMaterPlanConfigBillReportForLack.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_NeedMaterPlanConfigBillReportForLack.html"
index d7fb7d7..0bdad88 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_NeedMaterPlanConfigBillReportForLack.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_NeedMaterPlanConfigBillReportForLack.html"
@@ -140,6 +140,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_insert" id="get_insert"><i class="layui-icon layui-icon-export"></i>蹇嵎鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -189,6 +190,10 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //蹇嵎鏂板
+ case 'get_insert':
+ get_insert();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -320,7 +325,7 @@
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ DisPlay_HideColumn();
layer.close(ajaxLoad);
@@ -481,7 +486,18 @@
// }
// }
//}
- table.exportFile(ins.config.id, option.data, "xls");
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
}
@@ -498,6 +514,47 @@
}
//#endregion
+ //#region 蹇嵎鏂板
+ function get_insert() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (set_ModCheck("JIT_NeedMaterPlanConfigBill_Edit") == false) {
+ return layer.msg("鏃犳潈闄�!")
+ }
+ if (CheckStatus.data.length == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ } else {
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function () {
+ var ajaxLoad = layer.load();
+ var message = "";
+ for (var i = 0; i < CheckStatus.data.length; i++) {
+ var sql = "exec h_p_JIT_NeedMaterPlanConfigBillReportForLack_Copy " + CheckStatus.data[i].HOrgID + "," + CheckStatus.data[i].HMaterID + "," + CheckStatus.data[i].HDeptID
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ message += i + "." + data1.data[0].Remark + CheckStatus.data[i].鐗╂枡鍚嶇О+ "\\n"
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ layer.alert(message, { icon: 5 });
+ layer.close(ajaxLoad);
+ //鍒锋柊鏁版嵁
+ get_FastQuery(2);
+ }
+ })
+ }
+ }
+ //#endregion
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
@@ -632,6 +689,26 @@
form.render('select');
}
//#endregion
+ //鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
});
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 00d45e6..0cea968 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -553,7 +553,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 3462f5e..bab962d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -562,7 +562,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index ba5e7ee..3f15d93 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -536,7 +536,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HRecDeptID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
$("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
@@ -572,7 +572,7 @@
var LoadData = data.data;
$("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
$("#HDeptName").val(LoadData[0].鍙戦�侀儴闂�); //鍙戦�侀儴闂�
- $("#HReceiveID").val(LoadData[0].HReceiveID); //閮ㄩ棬ID
+ $("#HReceiveID").val(LoadData[0].HReceiveID == undefined ? 0 : LoadData[0].HReceiveID); //閮ㄩ棬ID
$("#HReceiveName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //鎺ユ敹閮ㄩ棬
$("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷ID
$("#HErrMsgBackTypeName").val(LoadData[0].鎺ユ敹閮ㄩ棬); //寮傚父绫诲瀷
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
index 41b484b..999bf08 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
@@ -355,6 +355,7 @@
function fetchListData(HSourceID) {
if (HSourceID != "0" && HSourceID != null && HSourceID!="") {
$('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
+ HSourceID1 = HSourceID;
//鎵ц鑱斿姩浜嬩欢
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetWorkBillList",
@@ -655,6 +656,156 @@
//璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
iframe.edit(data);
},
+ });
+ }
+
+ //蹇嵎寮�宸�
+ function OpenFastWork(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎寮�宸�")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭寮�宸ュ悧?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/FastBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ }
+
+ //蹇嵎瀹屽伐
+ function OpenFastEnd(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎瀹屽伐")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭瀹屽伐鍚�?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESEndWorkBill/FastEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ }
+
+ //蹇嵎鍋滃伐
+ function OpenFastStop(event, obj) {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ if (!WorkStaus(HSourceID1, workcode, HSourceInterID, "蹇嵎鍋滃伐")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!", { icon: 5 });
+ return false;
+ }
+ var indexOpen = layer.open({
+ type: 1
+ , title: "纭鍋滃伐鍚�?"
+ , closeBtn: false
+ , area: '300px;'
+ , shade: 0.8
+ , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
+ , btn1: function (index, layero, e) {
+
+ //鏂板寮�宸ュ崟
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESStopWorkBill/FastStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HBillType": HBillType, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "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();
+ });
+ layer.close(indexOpen);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
});
}
@@ -1465,6 +1616,78 @@
});
return flag;
+ case "蹇嵎寮�宸�":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID,"type":"寮�宸�"}
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
+ case "蹇嵎鍋滃伐":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID, "type": "瀹屽伐" }
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
+ case "蹇嵎瀹屽伐":
+ sWhere = { "HSourceID": HSourceID1, "HICMOBillNo": workcode, "HInterID": HSourceInterID, "type": "鍋滃伐" }
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": JSON.stringify(sWhere) },
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0) {
+ flag = true;
+
+ }
+ else {
+ flag = false;
+ }
+ },
+ error: function (err) {
+ flag = false;
+ }
+ });
+
+ return flag;
}
}
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index d66cd14..5197a15 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -48,6 +48,13 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁″垝鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 58px;width:160px;">
@@ -102,88 +109,88 @@
</div>
</div>
<!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <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-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: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
- <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>-->
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>-->
</div>
</div>
@@ -242,6 +249,26 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ //$('#HDate').prop('disabled', true);
+ //$('#HDate1').prop('disabled', true);
+
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ //$('#HDate').prop('disabled', false);
+ //$('#HDate1').prop('disabled', false);
+ }
+ });
+ //#endregion
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
@@ -416,9 +443,13 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
//鍒濆鍖栨棩鏈�
$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//鑷�
+ $("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
//鍒濆鍖栬〃鏍�
@@ -438,8 +469,8 @@
, page: true
, cellMinWidth: 90
, totalRow: true
- , limit: 1000
- , limits: [50, 500,1000, 5000, 20000]
+ , limit: 50
+ , limits: [50, 500,1000, 5000]
//, loading: false
, cols: [[
{ type: 'checkbox', fixed: 'left' }
@@ -458,7 +489,10 @@
, { field: '鏃ヨ鍒掓暟閲�', title: '鏃ヨ鍒掓暟閲�', sort: true, totalRow: true, filter: true }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true, filter: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true }
- , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鐗╂枡瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸鍨嬪彿', sort: true, filter: true }
+ , { field: '鍗曚綅鐢ㄩ噺', title: '鍗曚綅鐢ㄩ噺', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿浠ｇ爜', title: '渚涜揣杞﹂棿浠ｇ爜', sort: true, filter: true }
+ , { field: '渚涜揣杞﹂棿', title: '渚涜揣杞﹂棿', sort: true, filter: true }
, { field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺', sort: true, totalRow: true, filter: true }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺', sort: true, totalRow: true, filter: true }
@@ -811,7 +845,7 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
$("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 7), "yyyy-MM-dd"));//鑷�
+ $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMaterAtt").val("");
form.render('select');
sWhere = "";
@@ -910,6 +944,24 @@
form.render('select');
}
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [7,30, 45, 60];
+ var titleList = ["杩�7澶�","杩戜竴鏈�", "杩�45澶�", "杩�60澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("30");
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 2b3fb61..2f0e1fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -254,7 +254,24 @@
}
}
- columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
+ columns.push({
+ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true, templet: function (d) {
+ //console.log(d); // 寰楀埌褰撳墠琛屾暟鎹�
+ //console.log(this); // 寰楀埌琛ㄥご褰撳墠鍒楅厤缃」
+ //console.log(d.LAY_NUM);
+ let sum = 0;
+
+ // 閬嶅巻鏁版嵁瀵硅薄鐨勬墍鏈夊睘鎬�
+ for (let key in d) {
+ // 妫�鏌ュ垪鍚嶆槸鍚︾鍚� isValidDate 鏉′欢
+ if (isValidDate(key)) {
+ // 灏� null/undefined 杞负 0
+ sum += d[key] ? parseFloat(d[key]) : 0;
+ }
+ }
+
+ return sum; // 淇濈暀涓や綅灏忔暟
+ } });
option = {
elem: '#mainTable'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index 5366228..9b18112 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -248,7 +248,25 @@
j = 0;
}
}
- columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
+ columns.push({
+ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true, templet: function (d) {
+ //console.log(d); // 寰楀埌褰撳墠琛屾暟鎹�
+ //console.log(this); // 寰楀埌琛ㄥご褰撳墠鍒楅厤缃」
+ //console.log(d.LAY_NUM);
+ let sum = 0;
+
+ // 閬嶅巻鏁版嵁瀵硅薄鐨勬墍鏈夊睘鎬�
+ for (let key in d) {
+ // 妫�鏌ュ垪鍚嶆槸鍚︾鍚� isValidDate 鏉′欢
+ if (isValidDate(key)) {
+ // 灏� null/undefined 杞负 0
+ sum += d[key] ? parseFloat(d[key]) : 0;
+ }
+ }
+
+ return sum; // 淇濈暀涓や綅灏忔暟
+ }
+ });
option = {
elem: '#mainTable'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index b14df31..753bb1f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -12,6 +12,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -159,6 +160,12 @@
</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="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ </div>
+ </script>
</form>
</div>
</div>
@@ -190,6 +197,8 @@
, soulTable = layui.soulTable
var sWhere = "";
var option = [];
+ var HModName = "ReportWorkDemandPlanBill";
+ var ins = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -200,6 +209,20 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumnNoPageForPlan(HModName, option, get_FastQuery);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ };
+ });
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
@@ -250,7 +273,8 @@
columns.push({ type: 'checkbox', fixed: 'left', sort: true});
columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐', sort: true});
columns.push({ field: '閮ㄩ棬', title: '鐢熶骇杞﹂棿', sort: true});
- columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true});
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true });
+ columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true});
columns.push({ field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', sort: true});
@@ -290,7 +314,7 @@
j = 0;
}
}
- columns.push({ field: '', title: '璁″垝鏄庣粏_鍚堣' });
+ columns.push({ field: '璁″垝鏄庣粏_鍚堣', title: '璁″垝鏄庣粏_鍚堣' });
option = {
elem: '#mainTable'
@@ -332,6 +356,21 @@
})
}
+ function get_Export() {
+ var data = option.data;
+ data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
+
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -342,7 +381,9 @@
success: function (result) {
if (result.count == 1) {
option.data = result.data;
- table.render(option);
+ //鍒楄缃�
+ DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
+ ins = table.render(option);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
index 924c567..42956d3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBillList.html"
@@ -32,18 +32,19 @@
</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="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鏃ユ湡闂撮殧</label>
<div class="layui-input-block">
<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -382,6 +383,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -639,6 +642,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ShiftsBeginInfoBill/get锘縎c_ShiftsBeginInfoBillListPage',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
success: function (data1) {
option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -662,7 +666,10 @@
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: '鍗曟嵁鍙�' });
+ 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>'
+ } });
}
else {
switch (data[i].Type) {
@@ -994,9 +1001,9 @@
//褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
var data = data1.data;
//褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
- HInterID_Choose = data[0].HInterID;
+ HInterID_Choose = data[0].hmainid;
//杩囨护鏂规鍐呯爜
- HInterID = data[0].HInterID
+ HInterID = data[0].hmainid
//杩囨护鏂规鍚嶇О
HDefaultFilter = data[0].鏂规鍚嶇О
//杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
@@ -1019,7 +1026,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(1)
+ //get_FastQuery(1)
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
index 6448768..2753e29 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\217\255\346\254\241\345\274\200\347\217\255\345\215\225/Sc_ShiftsBeginInfoBill_Add_Edit.html"
@@ -29,6 +29,7 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<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="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -317,7 +318,7 @@
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+ GetDefValByUser();
}
else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //澶嶅埗
OperationType = 1;
@@ -329,6 +330,14 @@
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val('');
+ $("#HUpDateDate").val('');
+ $("#HChecker").val('');
+ $("#HCheckDate").val('');
+ $("#HCloseMan").val('');
+ $("#HCloseDate").val('');
+ $("#HDeleteMan").val('');
+ $("#HDeleteDate").val('');
//鍒濆鍖栨棩鏈�
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
@@ -393,6 +402,11 @@
}
});
//#endregion
+
+ //瀹℃牳
+ form.on('submit(set_CheckBill)', function (data) {
+ set_CheckBill(1);
+ });
//#region 閫�鍑�
form.on('submit(btnEdit)', function (data) {
@@ -554,7 +568,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽憳鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker&openType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -844,6 +858,39 @@
}
//#endregion
+ //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ function GetDefValByUser() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+ type: "GET",
+ async: false,
+ data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+
+ form.val("formData", {
+ //"HSourceID": data.HSourceID,
+ //"HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+ "HDeptID": data["HDeptID"]
+ , "HDeptName": data["閮ㄩ棬鍚嶇О"]
+ , "HWorkCenterID": data["HWorkCenterID"]
+ , "HWorkCenterName": data["宸ヤ綔涓績鍚嶇О"]
+ , "HSourceID": data["HSourceID"]
+ , "HSourceName": data["鐢熶骇璧勬簮鍚嶇О"]
+ , "HGroupID": data["HGroupID"]
+ , "HGroupName": data["鐢熶骇鐝粍鍚嶇О"]
+ });
+ layer.close(index);
+ }
+ , error: function () {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触");
+ }
+ })
+ }
+ //#endregion
+
//#region 闈炵┖楠岃瘉
function AllowLoadData(data) {
//#region 琛ㄥご鏁版嵁妫�楠�
@@ -927,7 +974,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=&openType=2', "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -969,6 +1016,16 @@
}
, btn2: function (index, layero) { }
, end: function () {
+
+ if (typeof (OptionData[0].HItemID) != "undefined") {
+ obj.update({
+ "HWorkEmpID": OptionData[0].HItemID
+ , "HWorkEmpNumber": OptionData[0].鑱屽憳浠ｇ爜
+ , "HWorkEmpName": OptionData[0].鑱屽憳鍚嶇О
+
+ })
+ }
+ OptionData = "";
}
});
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index fce8e8d..69a82f8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -1130,6 +1130,8 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == "HRelationBillNo") {
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1138,7 +1140,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1148,7 +1150,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- if ($("#HMaterName").val() == checkStatus.data[0].浜у搧 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
+ if ($("#HSourceName").val() == checkStatus.data[0].鐢熶骇璧勬簮 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
obj.update({
"HProcExchInterID": checkStatus.data[0].hmainid
, "HProcExchEntryID": checkStatus.data[0].hsubid
@@ -1171,14 +1173,14 @@
})
}
else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
, end: function () {
- if ($("#HMaterName").val() == OptionData[0].浜у搧 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
+ if ($("#HSourceName").val() == OptionData[0].鐢熶骇璧勬簮 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
obj.update({
"HProcExchInterID": OptionData[0].hmainid
, "HProcExchEntryID": OptionData[0].hsubid
@@ -1200,7 +1202,7 @@
})
} else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
OptionData = [];
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 98529f6..a035024 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -26,6 +26,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
@@ -699,6 +700,11 @@
//鎻愭枡杩愮畻
form.on('submit(btnTLYS)', function (data) {
get_btnTLYS();
+ })
+
+ //瑕佹枡杩愮畻
+ form.on('submit(btnYLYS)', function (data) {
+ get_btnYLYS();
})
//鐢熶骇璁㈠崟閫夊崟
@@ -1697,6 +1703,34 @@
});
}
+ //瑕佹枡杩愮畻
+ function get_btnYLYS() {
+ sWhere = {
+ HProdORGID: $("#HProdORGID").val()
+ , HWorkShopID: $("#HWorkShopID").val()
+ }
+ sWhere = JSON.stringify(sWhere);
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery(2);
+ layer.msg(data1.Message);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//鐢熶骇璁㈠崟閫夊崟
function get_btnICMOBill() {
var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index f8cfdf5..cd8dcd8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -1298,7 +1298,7 @@
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
+ get_Display_2(HinterID_S);
}
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2207,6 +2207,12 @@
if (HCount > 50000) {
break;
}
+
+ if (option.data[i].閿佸畾宸ュ崟 == "鏄�") {
+ HArrIndex_PC.push(i);
+ continue;
+ }
+
var old_date = new Date();
//element.progress('demo', (i + 1) * HProgress + '%')
@@ -3078,15 +3084,30 @@
//灏嗘暟鎹帓绋嬪埌缃戞牸
function SetInfoToGrid(grd, ds, dsPre, iRow, sLeftQty, sWorkQty, bAddFlag, HPlanDay) {
+ var dsindex = 0;
+ var HPCDate_Reset = "";
//鍒ゆ柇褰撳墠鐢熶骇璧勬簮宸茬粡鎺掍骇鍒板摢涓棩鏈熶簡锛屽綋鍓嶇敓浜ц祫婧愯繕鏈変骇鑳界殑鏈�杩戞棩鏈熶笌褰撳墠璁㈠崟鐨勬帓浜ф棩鏈熶笉绗︼紝鍒欓噸缃綋鍓嶆帓浜ф棩鏈�
if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') != Format(HPCDate, 'yyyy/MM/dd')) {
+
+ for (var i = 0; i < ds.length; i++) {
+ if (Format(ds[i]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ //鐢ㄦ潵閲嶇疆褰撳墠鎺掍骇鏃ユ湡锛堟湁浜涜鍗曞紑宸ユ棩鏈熼潬鍚庯紝瑕佸厛鎶婂悗闈㈡棩鏈熺殑璧勬簮宸ユ椂鍗犵敤锛屾帓浜х粨鏉熷悗鍦ㄦ妸鏃ユ湡璋冨洖鍒版病琚帓浜х殑鏃ユ湡锛�
+ if (i != 0) {
+ HPCDate_Reset = ds[0]["鏃ユ湡"];
+ }
+
+ //鍖归厤璁㈠崟閫傚悎鐨勬帓浜ф棩鏈�
+ dsindex = i;
+ break;
+ }
+ }
//褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡婊¤冻鏈�鏃╁紑宸ユ棩鏈燂紝鍒欓噸缃帓浜ф棩鏈熶负褰撳墠鐢熶骇璧勬簮鍓╀綑浜ц兘鏈�杩戠殑鏃ユ湡
- if (Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
+ if (Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd') >= Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd') || HArrIndex_PC.length == option.data.length || HArrIndex.length + HArrIndex_PC.length == option.data.length) {
if (HArrIndex.length + HArrIndex_PC.length == option.data.length) {
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
} else {
- HPCDate = Format(ds[0]["鏃ユ湡"], 'yyyy/MM/dd');
+ HPCDate = Format(ds[dsindex]["鏃ユ湡"], 'yyyy/MM/dd');
}
//濡傛灉鏄渶鍚庝竴绗旇鍗曞湪鎺掍骇锛屽垯閲嶇疆鎺掍骇鏃ユ湡涓烘渶鏃╁紑宸ユ棩鏈燂紙涓嬫柟浼氬垽鏂紝涓嶄細瓒呬骇鑳芥帓浜э級
@@ -3094,7 +3115,6 @@
HPCDate = Format(grd.data[iRow]['鏈�鏃╁紑宸ユ棩鏈�'], 'yyyy/MM/dd');
}
} else { //褰撳墠鏃ユ湡涓嶇鍚堣鍗曠殑鏈�鏃╁紑宸ユ棩鏈燂紝鍒欐妸璁㈠崟閲嶆柊鍔犲叆寰呮帓浜у垪琛�
-
//灏嗕笅鏍囧姞鍏ユ湭鎺掍骇璁㈠崟鏁扮粍
if (HArrIndex.indexOf(iRow) == -1) {
HArrIndex.push(iRow);
@@ -3314,7 +3334,12 @@
//oSub.iRow = iRow;
//oSub.iCol = j;
//option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
- HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+
+ if (HPCDate_Reset != "") {
+ HPCDate = HPCDate_Reset;
+ } else {
+ HPCDate = Format(grd.cols[0][j].field, 'yyyy/MM/dd');//璧嬪�兼帓浜ф棩鏈�
+ }
HIsPriority = false;
break;
@@ -3794,6 +3819,13 @@
//鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
var num = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || option.data[i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ option.data[i].鐗╂枡鍚嶇О = option.data[i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (option.data[i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || option.data[i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ option.data[i].瑙勬牸鍨嬪彿 = option.data[i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
if (option.data[i] != "") {
if (parseFloat(option.data[i]["鎷嗗崟鏁伴噺"]) == 0) {
return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
@@ -3806,42 +3838,50 @@
}
}
- //var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr +"&鍜�" + sessionStorage["HUserName"];
-
+ var HDataSub = [];
var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
- async: HAsync,
- data: { "sMainSub": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- if ($("#HWorkShopID").val() == 0) {
- get_FastQuery(1);
- HAsync = true;
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < option.data.length; i += 100) {
+ HDataSub = option.data.slice(i, i + 100)
+ console.log("寮�濮嬩繚瀛樺墠" + i + "鏉¤鍗�");
+
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: HAsync,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.close(index);
+ //layer.msg("淇濆瓨鎴愬姛");
}
else {
- get_FastQuery(2);
+ //layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- layer.close(index);
- layer.msg("淇濆瓨鎴愬姛");
- }
- 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: "娓╅Θ鎻愮ず" });
HAsync = true;
}
- },
- error: function (err) {
- layer.close(index);
- layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- HAsync = true;
- }
- });
+ });
+ }
+ layer.close(index);
+ if ($("#HWorkShopID").val() == 0) {
+ get_FastQuery(1);
+ HAsync = true;
+ }
+ else {
+ get_FastQuery(2);
+ HAsync = true;
+ }
}
function set_AddNew1(num) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index edf9d53..906d133 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -317,11 +317,12 @@
function set_InitGrid(Year,Month,num) {
var SumMonth = new Date(Year, Month, 0).getDate(); //鍔ㄦ�佽幏鍙栨湀澶╂暟
var col = [];
+ var HWeekARR = ["鏃�", "涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�"];//鑾峰彇浠婂ぉ鏄槦鏈熷嚑鐢紝鍦╰itle澶勬嫾鎺�
var colData = "{";
col.push({ field: "鏈堜唤", title: "鏈堜唤", width: 60 })
colData += "\"鏈堜唤\":\"" + Month+"鏈圽",";
for (var j = 1; j <= SumMonth; j++) {
- col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd'), width: 50, edit: 'text' })
+ col.push({ field: Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd'), title: Format(Year + '/' + Month + '/' + j, 'dd') + '(' + HWeekARR[new Date(Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd')).getDay()]+')', width: 70, edit: 'text' })
colData += "\"" + Format(Year + '/' + Month + '/' + j, 'yyyy-MM-dd') + "\":\"" + num + "\",";
}
colData = colData.substr(0, colData.length - 1);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
index cbf8154..19d621a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
@@ -434,7 +434,7 @@
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
$('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
- $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
}
form.render('select');
break;
@@ -454,7 +454,7 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
$('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
- $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
}
form.render('select');
}
@@ -531,7 +531,7 @@
"HBadPhenomenaID": checkStatus.data[0].HItemID
, "HBadPhenomenaName": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
})
- $("#HBadPhenomenaName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
+ $("#HBadPhenomena" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html"
index ec3b4ec..aaa8529 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\277\253\346\215\267\346\226\271\345\274\217\350\207\252\345\256\232\344\271\211/Xt_UserFastMenu.html"
@@ -32,7 +32,15 @@
var option = {}; //鏍戠粍浠剁殑娓叉煋鍙傛暟锛屼繚瀛樻爲缁勪欢娓叉煋鐨勪俊鎭�
var saveData = []; //瀛樺偍鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鏁版嵁锛屼紶閫掔粰鍚庣杩涜淇濆瓨
var menuDefineData = []; //浠ョ埗瀛愮骇缁撴瀯瀛樻斁鏍戠粍浠剁殑鑷畾涔夋暟鎹紝鐢ㄦ潵璧嬬粰option
+ var ID = -1;
//#endregion
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ ID = -1;//鎿嶄綔绫诲瀷
+ } else {
+ ID = params[params[0]];//鎿嶄綔绫诲瀷
+ }
//#region 鍒濆鍖栭〉闈�
set_ClearBill(); //璋冪敤鍒濆鍖栫晫闈㈡柟娉曪紝瀹屾垚鐣岄潰鐨勫垵濮嬪寲
@@ -84,11 +92,11 @@
var checkedData = tree.getChecked('demo-id-1'); // 鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
saveData = []; //娓呯┖淇濆瓨鑷畾涔夋暟鎹殑鍒楄〃鐨勬暟鎹�
getSelectedData(checkedData); //灏嗛�変腑鐨勮妭鐐圭殑淇℃伅浠ュ垪琛ㄧ殑褰㈠紡淇濆瓨鍦╯aveData涓�
- //if (saveData.length > 7) {
- // layer.msg('璁剧疆瓒呴锛岃淇濊瘉蹇嵎鏂瑰紡浣庝簬8涓紒锛�');
- // return;
- //}
- var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType;
+ if (saveData.length > 8) {
+ layer.msg('璁剧疆瓒呴锛岃淇濊瘉蹇嵎鏂瑰紡涓嶈秴杩囦簬8涓紒锛�');
+ return;
+ }
+ var sMainSub = JSON.stringify(saveData) + ";" + sessionStorage["HUserName"] + ";" + HType + ";" + ID;
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Web/Xt_UserFastMenu_Save",
@@ -133,7 +141,7 @@
url: GetWEBURL() + "/Web/Xt_UserFastMenu_Display",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType, "HModelAtributos": ID },
success: function (res) {
var dt = res.data.dt; //鑿滃崟娓呭崟鐨勫叏閮ㄤ俊鎭笌琚�変腑鎯呭喌
var trees = res.data.tree; //鏍戠粍浠剁殑鏍硅妭鐐�
@@ -172,6 +180,8 @@
//#endregion
+
+
});
</script>
</body>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 5ad4715..9d7417c 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -63,7 +63,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐢ㄦ埛鍚�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;">
+ <input type="text" class="layui-input" name="Czymc" lay-verify="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;" readonly>
<button type="button" lay-submit="" class="layui-btn" lay-filter="CzymcList" style="width: 40px; display: none;">
<i style="margin-left:-9px;">閲嶇疆</i>
</button>
@@ -74,7 +74,7 @@
<div class="layui-inline">
<label class="layui-form-label">瀵嗙爜</label>
<div class="layui-input-inline">
- <input type="password" class="layui-input" name="Czmm" id="Czmm" value="">
+ <input type="password" class="layui-input" name="Czmm" id="Czmm" value="" autocomplete="new-password" readonly>
</div>
</div>
<div class="layui-inline">
@@ -354,7 +354,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -384,8 +384,10 @@
if (OperationType == 1) {//鏃犳簮鏂板
Sav = "Add";
$('#Czybm').attr("disabled", false);
- $('#Czymc').attr("disabled", false);
- $('#Czmm').attr("disabled", false);
+ //$('#Czymc').attr("disabled", false);
+ //$('#Czmm').attr("disabled", false);
+ //$('#Czymc').prop('readonly', false);
+ //$('#Czmm').prop('readonly', false);
$('#Czyyz').attr("disabled", false);
$('#Explain').attr("disabled", false);
@@ -393,8 +395,10 @@
else if (OperationType == 3) {//缂栬緫
Sav = "Update";
$('#Czybm').attr("disabled", true);
- $('#Czymc').attr("disabled", true);
- $('#Czmm').attr("disabled", true);
+ $('#Czymc').prop('readonly', true);
+ //$('#Czymc').attr("disabled", true);
+ $('#Czmm').prop('readonly', true);
+ //$('#Czmm').attr("disabled", true);
$('#Czyyz').attr("disabled", true);
$('#Explain').attr("disabled", false);
@@ -499,6 +503,19 @@
btnHCheckEmp();
});
+ $('#Czymc').focus(function () {
+ if (OperationType == 1) {
+ $('#Czymc').prop('readonly', false);
+ }
+
+ });
+
+ $('#Czmm').focus(function () {
+ if (OperationType == 1) {
+ $('#Czmm').prop('readonly', false);
+ }
+ });
+
//淇濆瓨
form.on('submit(Saver)', function (data) {
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 f432171..04fb572 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"
@@ -755,7 +755,7 @@
HBillSubType = 3301
$("#HMaterID").val(params[params[3]]);//鐗╂枡ID
-
+ $("#HName").val(getParams("HMaterNumber"));//宸ヨ壓璺嚎鍚嶇О
$("#HMaterNumber").val(getParams("HMaterNumber"));//鐗╂枡浠ｇ爜
$("#HMaterName").val(getParams("HMaterName"));//鐗╂枡鍚嶇О
$("#HMaterModel").val(getParams("HMaterModel") == "" ? " " : getParams("HMaterModel"));//瑙勬牸鍨嬪彿
@@ -1403,7 +1403,7 @@
case 'HWorkQty': //绾﹀綋绯绘暟
if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
obj.update({
- HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
+ HYDCoefficient: !isNaN(parseFloat((localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) : 0
});
}
break;
@@ -2277,7 +2277,7 @@
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6) : 0;//绾﹀綋绯绘暟=鍩哄噯鍊�/灏忔椂浜ц兘
j++;
}
}
@@ -2312,7 +2312,7 @@
, "宸ユ": OptionData[0].宸ユ鍚嶇О
, "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
, "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
- , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)
+ , "HYDCoefficient": !isNaN(parseFloat((localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) : 0
})
OptionData = [];
@@ -2712,7 +2712,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
@@ -2753,7 +2753,7 @@
option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = data.data[j]["宸ユ鍚嶇О"];
option.data[i]["鏍囧噯宸ヤ环"] = WorkCente[j]["鏍囧噯宸ヤ环"];
- option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
+ option.data[i]["HYDCoefficient"] = !isNaN(parseFloat((localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6))) == true ? (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6) : 0;
j++;
}
}
@@ -3048,7 +3048,7 @@
//}
//else {
- // if (option.data[i]["HCenterID"] == "0") {
+ // if (option.data[i]["HCenterID"] == "0"&&option.data[i]["宸ュ簭浠ｇ爜"] != "9999") {
// layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
// return false;
// }
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 474656e..9f5b8c6 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -107,7 +107,7 @@
<button class="layui-btn layuiadmin-btn-order" style="" 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; display: none;">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">閲嶇疆</button>
</div>
<!--鏄剧ず褰撳墠杩囨护鏂规-->
<div class="layui-inline" style="margin-left:5px;">
@@ -205,6 +205,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excel瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
@@ -389,6 +390,9 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
+ break;
+ //瀵煎叆
+ case 'set_Excel': set_Excel();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -1637,6 +1641,22 @@
}
//#endregion
+ //瀵煎叆
+ function set_Excel() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎鍒楄〃-瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBillimport.html'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ }
+ })
+ }
+
//#region 鑾峰彇瀵煎嚭鏁版嵁
function getExportData() {
var data;//瀵煎嚭鐨勬暟鎹�
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 e62ea36..12bd577 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"
@@ -1409,7 +1409,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?Type=HTechParamList&OperationType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?Type=HTechParamList', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1687,6 +1687,7 @@
data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
+ HSendDDMeg(HInterID);
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -1705,6 +1706,24 @@
}
//#endregion
+ //#region 瀹℃牳鍚庡彂閫佷俊鎭�
+ function HSendDDMeg(HInterID) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID },
+ success: function (result) {
+ if (result.count != 1) {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
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_EquipICMOTechParamBillList.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_EquipICMOTechParamBillList.html"
index 8f4e372..f934838 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_EquipICMOTechParamBillList.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_EquipICMOTechParamBillList.html"
@@ -591,6 +591,7 @@
data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
+ HSendDDMeg(HInterID);
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -618,6 +619,25 @@
}
//#endregion
+
+ //#region 瀹℃牳鍚庡彂閫佷俊鎭�
+ function HSendDDMeg(HInterID) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID},
+ success: function (result) {
+ if (result.count != 1) {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
//#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 4861e36..a5f3f40 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -71,9 +71,9 @@
</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" class="layui-input" name="HBarCode" id="HBarCode">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
</div>
</div>
</div>
@@ -1644,6 +1644,10 @@
layer.msg("璇烽�夋嫨璁惧鐘舵�侊紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HBarCode").val() == '' || $("#HBarCode").val() == null) {
+ layer.msg("璇疯緭鍏ユ潯褰㈢爜锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
}
</script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
index c7599e6..a8a4ec4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
@@ -723,6 +723,13 @@
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
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index 829a11f..56e4598 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -663,6 +663,13 @@
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
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillList.html"
index 76b732b..03675cf 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillList.html"
@@ -718,6 +718,13 @@
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
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
index 84bb748..8444619 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
@@ -374,9 +374,20 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HSourceName").val("");
- $('#HSourceID').val("0");
+ $('#HSourceID').val("");
+ var HStatus = $("#HReadFlag").val();//闃呰鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HSourceID = $("#HSourceID").val();//鐢熶骇璧勬簮
+ sWhere = {
+ HStatus: HStatus
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HSourceID: HSourceID
+ }
+ get_Display(JSON.stringify(sWhere));
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
- get_Display(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index e105ed1..a79dd97 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -425,7 +425,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
- , "HControlUpperLimit": 0, "HControlLowerLimit": 0
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
};
switch (obj.event) {
//鏂板涓�琛�
@@ -1114,6 +1114,8 @@
, { field: 'HDownOffSetTxt', title: '涓嬪亸宸枃鏈�', edit: 'text' }
, { field: 'HControlUpperLimit', title: '鎺у埗涓婇檺', edit: 'text' }
, { field: 'HControlLowerLimit', title: '鎺у埗涓嬮檺', edit: 'text' }
+ , { field: 'HSampleCount', title: '鏍锋湰鏁�', edit: 'text' }
+ , { field: 'HSampleDayCount', title: '鏍锋湰澶╂暟', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
];
@@ -1185,7 +1187,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
- , "HControlUpperLimit": 0, "HControlLowerLimit": 0
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
}];
table.render(option);
//鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
@@ -1206,7 +1208,7 @@
, "HDownOffSetQ": 0, "HTargetValB": 0, "HUpLimitB": 0, "HDownLimitB": 0, "HUpOffSetB": 0, "HDownOffSetB": 0
, "HTargetValTxt": "", "HUpLimitTxt": "", "HDownLimitTxt": "", "HUpOffSetTxt": "", "HDownOffSetTxt": ""
, "HQualityStdName": "", "HInspectMethodName": "", "HInspectInstruMentName": "", "HInspectBasisName": "", "HSampleSchemeName": ""
- , "HControlUpperLimit": 0, "HControlLowerLimit": 0
+ , "HControlUpperLimit": 0, "HControlLowerLimit": 0, "HSampleCount": 0, "HSampleDayCount": 0
}];
table.render(option);
}
@@ -1378,7 +1380,7 @@
"HDownLimitTxt": data[i].涓嬮檺鍊兼枃鏈�, "HUpOffSetTxt": data[i].涓婂亸宸枃鏈�, "HDownOffSetTxt": data[i].涓嬪亸宸枃鏈�,
"HQualityStdName": data[i].璐ㄩ噺鏍囧噯鍚嶇О, "HInspectMethodName": data[i].妫�楠屾柟娉曞悕绉�, "HInspectInstruMentName": data[i].妫�楠屼华鍣ㄥ悕绉�,
"HInspectBasisName": data[i].妫�楠屼緷鎹悕绉�, "HSampleSchemeName": data[i].瀛愭娊鏍锋柟妗堝悕绉�
- , "HControlUpperLimit": data[i].鎺у埗涓婇檺, "HControlLowerLimit": data[i].鎺у埗涓嬮檺
+ , "HControlUpperLimit": data[i].鎺у埗涓婇檺, "HControlLowerLimit": data[i].鎺у埗涓嬮檺, "HSampleCount": data[i].鏍锋湰鏁�, "HSampleDayCount": data[i].鏍锋湰澶╂暟
});
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 15ed0d6..71cb418 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -366,7 +366,7 @@
//#region 鐐瑰嚮琛岄�変腑楂樹寒
- table.on('row(mainTablemainTable)', function (obj) {
+ table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
@@ -427,13 +427,14 @@
//鑾峰彇椤圭洰鍙�
Get_HProject();
//鏌ヨ
- if (HName=="") {
- get_Display(sWhere);
- } else {
- sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
- sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
- get_Display(sWhere);
- }
+ //if (HName=="") {
+ // get_Display(sWhere);
+ //} else {
+ // sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+ // sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
+ // get_Display(sWhere);
+ //}
+ get_FastQuery()
//杩囨护鏂规鏌ヨ
get_DefaultModule();
}
@@ -644,6 +645,10 @@
}
if (HProject != "" && HProject!=0) {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
+ }
+ if (HName!="") {
+ sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+ sWhere += " and 宸ュ簭鍚嶇О = '" + HProcName + "'";
}
addSWhereByOpenType();
get_Display(sWhere);
@@ -942,7 +947,7 @@
var params = get_UrlVars();
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
if (typeof (openType) != "undefined") {
- sWhere += " and 绂佺敤鏍囪 = '' ";
+ sWhere += " and 瀹℃牳浜� != ''";
}
}
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
index b8bcc4e..9ca80d7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\347\216\257\345\242\203\346\243\200\346\265\213\345\215\225/QC_EnvironmentTestDotCheckBillList.html"
@@ -661,8 +661,13 @@
for (var i = 0; i < data.length; i++) {
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: '鍗曟嵁鍙�' });
+ }
+ 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) {
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_InspectionFormReport.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_InspectionFormReport.html"
index 5e2b479..4fe43a7 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_InspectionFormReport.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_InspectionFormReport.html"
@@ -50,7 +50,7 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-filter="HDeptName" lay-search class="layui-input">
<!--鍔ㄦ�佹覆鏌撹溅闂�-->
</select>
</div>
@@ -111,10 +111,20 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" id="xh">
<label class="layui-form-label" style="width: 85px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" id="HMouldNum" name="HMouldNum">
+ </div>
+ </div>
+ <div class="layui-inline" id="sczz" style="display:none">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px; margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -287,6 +297,12 @@
});
//#endregion
+ //#region 鐢熶骇璧勬簮
+ form.on('submit(btnHSourceID)', function (data) {
+ btnHSourceID();
+ });
+ //#endregion
+
//#region 妫�楠岄」鐩�
form.on('submit(btnHQCCheckItemID)', function (data) {
btnCheckProjectList(2);
@@ -340,6 +356,12 @@
}
});
});
+
+ //#region 妫�绱㈡ā寮忎笅鎷夊垪琛ㄧ洃鍚�
+ form.on('select(HDeptName)', function (data) {
+ changeInput_Dept();
+ });
+ //#endregion
//#endregion
@@ -463,6 +485,23 @@
});
}
+ //#region 鏍规嵁妫�绱㈡ā寮忚皟鏁� 鎼滅储妗�
+ function changeInput_Dept() {
+ var HSearchModel = $("#HDeptName").val();
+
+ if (HSearchModel == "389502" || HSearchModel == "15035820") {
+ //闅愯棌鐢熶骇璧勬簮
+ $("#sczz").hide();
+ $("#xh").show();
+ }
+ else {
+ //闅愯棌绌村彿
+ $("#xh").hide();
+ $("#sczz").show();
+ }
+ }
+ //#endregion
+
//PPK璁＄畻 x
function set_PPK() {
var x_AVG = 0;
@@ -470,10 +509,12 @@
var x_PPK = 0;
var x_CPK = 0;
var numCount = 0
+ //绯绘暟 涓嶅彉鐨�
var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];
+ //骞冲潎鍊肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
- if (optionAVG.length != 0 || optionS.length != 0) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
}
}
@@ -481,6 +522,7 @@
x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
$("#HCenterline_X").val(x_AVG.toFixed(5));
+ //锛堟瘡澶╃殑鏁版嵁-骞冲潎鍊肩殑骞冲潎鍊硷級 涔樺钩鏂� 鍦ㄧ浉鍔�
for (var i = 1; i < option.cols[0].length; i++) {
for (var j = 0; j < option.data.length - 3; j++) {
numCount += 1;
@@ -488,9 +530,11 @@
}
}
-
+ //锛坰um闄や互锛堟墍鏈夋暟閲忓噺-1锛夛級 寮�骞虫柟 涓嶅寘鍚悗涓夎
x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
+ //锛坰um闄や互锛堟墍鏈夋暟閲忥級锛� 寮�骞虫柟 涓嶅寘鍚悗涓夎
x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));
+
var limit = $("#limit").val();
if (parseInt(limit) >= 9) {
$("#HCenterline_S").val(x_PPK.toFixed(4));
@@ -498,52 +542,64 @@
//鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
if (limit == 1) {
+ //x鎺у埗涓婇檺 骞冲潎鍊肩殑骞冲潎鍊�+涓夊�嶇殑PPK X鎺у埗涓嬮檺 骞冲潎鍊肩殑骞冲潎鍊�-涓夊�嶇殑PPK
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+").toFixed(5))
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-").toFixed(5))
//璁＄畻鏍锋湰閲忎负1 鐨� ppk
+ //妫�楠岄」鐩細骞冲潎鍊�-涓嬮檺 闄や互涓夊�嶇殑PPK
var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
+ //妫�楠岄」鐩細涓婇檺-骞冲潎鍊� 闄や互涓夊�嶇殑PPK
var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
var DataHCPK = min > max ? max : min;
$("#HPPK").val(DataHCPK);
- //璁＄畻鏍锋湰閲忎负1 鐨� cpk
-
+ //璁＄畻鏍锋湰閲忎负1 鐨� cpk
var cpkSum = 0;
var CPK_U = 0;
var CPK_N = 0;
for (var i = 1; i < option.cols[0].length; i++) {
for (var j = 0; j < option.data.length - 3; j++) {
if (i == 1) {
+ //鑾峰彇绗竴琛岀殑绗竴涓��
CPK_U = option.data[j][option.cols[0][i].field];
} else {
CPK_N = option.data[j][option.cols[0][i].field];
+ //濡傛灉绗竴琛岀殑绗竴涓�煎ぇ浜庣浜屼釜鍊硷紝绗竴涓噺鍘荤浜� 鍚﹀垯灏辨槸 绗簩涓噺鍘荤涓�涓�
var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
+ //鎶婂�肩浉鍔�
cpkSum = calc(cpkSum, data_un, "+");
CPK_U = CPK_N;
}
}
}
+ //cpkSum 闄や互 绗竴琛屾�绘暟鍑忓幓2
cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
+ //cpkSum 闄や互绯绘暟
var HAVG_CPK = calc(cpkSum, 1.128, "/");
-
+ //妫�楠岄」鐩細骞冲潎鍊�-涓嬮檺 闄や互涓夊�嶇殑HAVG_CPK
min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
+ //妫�楠岄」鐩細涓婇檺-骞冲潎鍊� 闄や互涓夊�嶇殑HAVG_CPK
max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
DataHCPK = min > max ? max : min;
$("#HCPK").val(DataHCPK);
} else {
//涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//涓婇檺涓嶇瓑浜庣┖锛屼笅闄愮瓑浜庣┖
+ //妫�楠岄」鐩細锛堜笂闄愬��-骞冲潎鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
$("#HPPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//涓嬮檺涓嶇瓑浜庣┖锛屼笂闄愮瓑浜庣┖
+ //妫�楠岄」鐩細锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
$("#HPPK").val(HDownLimit.toFixed(4));
} else {
+ //妫�楠岄」鐩細锛堜笂闄愬��-骞冲潎鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ //妫�楠岄」鐩細锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
$("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
}
@@ -560,6 +616,7 @@
var D3 = [0,0.000, 0.000, 0.000, 0.000, 0.000, 0.076, 0.136, 0.184, 0.223];
var D4 = [0,3.267, 2.574, 2.282, 2.114, 2.004, 1.924, 1.864, 1.816, 1.777];
+ //姹傛瀬宸�肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
s_AVG = calc(s_AVG, parseFloat(optionS[0][option.cols[0][j].field]), "+");
@@ -567,13 +624,13 @@
}
s_AVG = calc(s_AVG, (option.cols[0].length - 1), "/")
s_AVG = $("#HCenterline_S").val() == "" || "0" ? s_AVG : parseFloat($("#HCenterline_S").val());
- $("#HCenterline_S").val(s_AVG);
+ $("#HCenterline_S").val(s_AVG);//S涓績绾�
var limit = $("#limit").val();
if (parseInt(limit) < 9) {
$("#HCenterline_S").val(s_AVG.toFixed(4));
}
-
+ //姹傚钩鍧囧�肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
@@ -581,33 +638,41 @@
}
x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
- $("#HCenterline_X").val(x_AVG.toFixed(5));
+ $("#HCenterline_X").val(x_AVG.toFixed(5));//X涓績绾�
s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
//鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
if (limit > 1) {
+ //骞冲潎鍊�+锛圓2鐨勭郴鏁颁箻浠� 鏋佸樊鍊肩殑骞冲潎鍊硷級
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+").toFixed(5))
+ //骞冲潎鍊�-锛圓2鐨勭郴鏁颁箻浠� 鏋佸樊鍊肩殑骞冲潎鍊硷級
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-").toFixed(5))
}
//宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ //D4鐨勭郴鏁� 涔樹互 鏋佸樊鍊肩殑骞冲潎鍊�
$("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
+ //D3鐨勭郴鏁� 涔樹互 鏋佸樊鍊肩殑骞冲潎鍊�
$("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
var limit = $("#limit").val();
if (limit > 1) {
//涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//涓嬮檺涓嶇瓑浜庣┖锛屼笂闄愮瓑浜庣┖
+ //锛堜笂闄愬��-骞冲潎鍊硷級闄や互 涓夊�嶇殑s_CPK
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
$("#HCPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//涓婇檺涓嶇瓑浜庣┖锛屼笅闄愮瓑浜庣┖
+ //锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互 涓夊�嶇殑s_CPK
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
} else {
+ //锛堜笂闄愬��-骞冲潎鍊硷級闄や互 涓夊�嶇殑s_CPK
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
+ //锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互 涓夊�嶇殑s_CPK
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
@@ -960,19 +1025,19 @@
//璁＄畻spc鍏ぇ鍒ゅ畾
function spc_judge() {
- //鍧囧��
+ //鍧囧�� 锛堜笂闄�-涓績闄愶級闄や互 3 鍒嗘垚3鍒�
var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
//涓婇檺閮ㄥ垎
- var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
+ var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());//涓婇檺
var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
//涓嬮檺閮ㄥ垎
- var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
+ var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());//涓嬮檺
var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);
- let HAvg = [];//骞冲潎鍊�
+ let HAvg = [];//骞冲潎鍊� 鏍规嵁X- 杩欎竴琛岃绠楃殑
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0) {
@@ -983,10 +1048,14 @@
//杩炵画鍗佷簲涓偣鍦ㄤ腑蹇冪嚎涓や晶鐨凜鍖哄唴
var judge_return = [];
if (HAvg.length >= 15) {
+ //鍥犱负鏄�15涓偣 鎵�浠�14鐨勪笅鏍囧氨鏄15鏉℃暟鎹� 鐒跺悗鏄�0-15锛�1-16
for (var i = 14; i < HAvg.length; i++) {
if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
+ //鏍规嵁涓婇潰鐨刬鍊肩畻鍑轰粠閭ｄ釜涓嬫爣寮�濮�
for (var j = i - 14; j <= i; j++) {
+ //濡傛灉澶т簬璐焎,灏忎簬姝 閭ｅ氨鏈夐棶棰�
if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
+ //褰撴渶鍚庝竴鏉★紝濡傛灉澶т簬璐焎,灏忎簬姝 灏辫繘鍘昏拷鍔�15鏉℃暟鎹�
if (i == j) {
for (var j1 = i; j1 >= i - 14; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -995,7 +1064,7 @@
}
}
} else {
- break;
+ break; //缁堟褰撳墠15鏉★紝鎵ц涓嬩竴涓�15鏉�
}
}
}
@@ -1006,6 +1075,7 @@
for (var i = 13; i < HAvg.length; i++) {
var judge = [];
for (var j = i - 13; j < i; j++) {
+ //鐢ㄧ涓�涓窡绗簩鐨勫仛瀵规瘮锛岀浜屼釜璺熺涓変釜鍋氬姣旓紝浠ユ寰幆
if (HAvg[j] > HAvg[j + 1]) {
judge.push(1);
} else if (HAvg[j] < HAvg[j + 1]) {
@@ -1013,7 +1083,7 @@
}
}
for (var k = 0; k < judge.length; k++) {
- if (judge[k] + judge[k + 1] == 0) {
+ if (judge[k] + judge[k + 1] == 0) { //濡傛灉鍓嶅悗鐩稿姞绛変簬0閭ｅ氨鏄弧瓒筹紝涓嶆弧瓒冲氨鐩存帴璺冲嚭
if ((k + 1) == judge.length) {
for (var j1 = i; j1 >= i - 13; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1022,7 +1092,7 @@
}
}
} else {
- break;
+ break;//缁堟褰撳墠寰幆
}
}
}
@@ -1032,6 +1102,7 @@
if (HAvg.length >= 9) {
for (var i = 8; i < HAvg.length; i++) {
var judge = [];
+ //鐢ㄥ惊鐜殑鍊艰窡涓績绾垮姣�
for (var j = i - 8; j <= i; j++) {
if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
judge.push(1);
@@ -1039,10 +1110,12 @@
judge.push(-1);
}
}
+ //瀵瑰惊鐜殑鎻掑叆鐨勫�硷紝鐩稿姞
var sum = 0;
for (var k = 0; k < judge.length; k++) {
sum += judge[k];
}
+ //鍒ゆ柇寰幆鎻掑叆鐨勫�兼槸鍚︾瓑浜庢涔濇垨鑰呰礋涔�
if (sum == 9 || sum == -9) {
for (var j1 = i; j1 >= i - 8; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1056,9 +1129,12 @@
//杩炵画8鐐硅惤鍦ㄤ腑蹇冪嚎涓や晶涓旀棤涓�鍦–鍖轰互鍐�(鍗冲湪C鍖轰互澶�)
if (HAvg.length >= 8) {
for (var i = 7; i < HAvg.length; i++) {
+ //寰幆鐨勫�兼槸鍚﹀ぇ浜庢C 鎴栬�� 灏忎簬璐烠
if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
+ //婊¤冻 杩涜鍒ゆ柇鍓嶉潰鍊兼槸鍚︽弧瓒�
for (var j = i - 7; j <= i; j++) {
if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
+ //濡傛灉鏈�鍚庨兘婊¤冻 鎻掑叆
if (j == i) {
for (var j1 = i; j1 >= i - 7; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1067,7 +1143,7 @@
}
}
} else {
- break;
+ break; //鏈変竴涓笉婊¤冻鐩存帴缁堟褰撳墠寰幆
}
}
}
@@ -1078,6 +1154,7 @@
if (HAvg.length >= 6) {
for (var i = 5; i < HAvg.length; i++) {
var judge = [];
+ //鐢ㄧ涓�涓窡绗簩鐨勫仛瀵规瘮锛岀浜屼釜璺熺涓変釜鍋氬姣旓紝浠ユ寰幆
for (var j = i - 5; j < i; j++) {
if (HAvg[j] > HAvg[j + 1]) {
judge.push(1);
@@ -1085,10 +1162,12 @@
judge.push(-1);
}
}
+ //瀵硅拷鍔犵殑鍊� 杩涜绱姞
var sum = 0;
for (var k = 0; k < judge.length; k++) {
sum += judge[k];
}
+ //濡傛灉鏄浜旀垨鑰呰礋浜� 閭ｅ氨鍏ㄩ儴杩藉姞
if (sum == 5 || sum == -5) {
for (var j1 = i; j1 >= i - 5; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1103,15 +1182,22 @@
if (HAvg.length >= 5) {
for (var i = 4; i < HAvg.length; i++) {
var judge = [];
+ //褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
for (var j = i - 4; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
record.push(HAvg[j]);
if (record.length >= 4) {
+ //濡傛灉婊¤冻4鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 4; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //鏍规嵁
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1119,15 +1205,21 @@
}
}
+ //褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烠
else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
for (var j = i - 4; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烠
if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
record.push(HAvg[j]);
if (record.length >= 4) {
+ //濡傛灉婊¤冻4鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 4; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1143,15 +1235,21 @@
if (HAvg.length >= 3) {
for (var i = 2; i < HAvg.length; i++) {
var judge = [];
+ //褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
for (var j = i - 2; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
record.push(HAvg[j]);
if (record.length >= 2) {
+ //濡傛灉婊¤冻2鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 2; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1159,15 +1257,21 @@
}
}
+ //褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烞
else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
for (var j = i - 2; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烞
if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
record.push(HAvg[j]);
if (record.length >= 2) {
+ //濡傛灉婊¤冻2鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 2; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1183,11 +1287,13 @@
if (HAvg.length >= 0) {
for (var i = 0; i < HAvg.length; i++) {
var judge = [];
+ //鍒ゆ柇褰撳墠鍊兼槸鍚﹀ぇ浜� 姝
if (HAvg[i] > HAreaValue_A) {
if ($.inArray(HAvg[i], judge_return) == -1) {
judge_return.push(HAvg[i]);
}
}
+ //鍒ゆ柇褰撳墠鍊兼槸鍚﹀ぇ浜� 璐烝
else if (HAvg[i] < HAreaValue_FA) {
if ($.inArray(HAvg[i], judge_return) == -1) {
judge_return.push(HAvg[i]);
@@ -1243,6 +1349,7 @@
var HMaterID = $("#HMaterID").val();//鐗╂枡
var HQCCheckItemID = $("#HQCCheckItemID").val();//妫�楠岄」鐩�
var HMouldNum = $("#HMouldNum").val();//绌村彿
+ var HSourceID = $("#HSourceID").val();//鐢熶骇璧勬簮
if (limit == 0) {
return layer.msg("鏍锋湰鏁伴噺涓嶈兘涓�0!");
@@ -1264,6 +1371,7 @@
, HMaterID: HMaterID
, HQCCheckItemID: HQCCheckItemID
, HMouldNum: HMouldNum
+ , HSourceID: HSourceID
}
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -1299,6 +1407,32 @@
})
}
+ //鐢熶骇璧勬簮
+ function btnHSourceID() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
+
//妫�楠岄」鐩垪琛�
function btnHQCCheckItemID() {
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBillList.html"
index b0a5176..211f441 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\234\210\345\272\246\347\233\256\346\240\207\345\215\225/QC_MonthTarGetBillList.html"
@@ -287,6 +287,27 @@
})
//#endregion
+ table.on('tool(mainTable)', 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: '椤圭洰闃舵娓呭崟鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鏈堝害鐩爣鍗�/QC_MonthTarGetBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
@@ -392,6 +413,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
index 6183807..9a53760 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_WorkSelfCheckBillList.html"
@@ -735,6 +735,13 @@
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
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index 636962f..f2cccb2 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -432,6 +432,28 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var hID = data.hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -692,6 +714,13 @@
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
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
index 19a1537..40786b1 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillList.html"
@@ -320,6 +320,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓氱哗鎸囨爣鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -448,6 +468,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
index 01e951c..16729ff 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkReportWeekBillMainList.html"
@@ -326,6 +326,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkReportWeekBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ get_FastQuery();
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -511,6 +531,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
index 2da7b96..4cbd5ce 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBillList.html"
@@ -333,6 +333,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkTaskWeekBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
optionPage.curr = 1;
@@ -579,6 +599,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index ab6095f..dec321a 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -372,7 +372,27 @@
});
})
//#endregion
-
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
table.reload('mainTable', {
initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
@@ -584,6 +604,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
index 2bf778f..71a26bc 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBillList.html"
@@ -344,6 +344,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -553,6 +573,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 5b65e58..5c60d4c 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -371,6 +371,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillSubType=' + HBillSubType
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//閲嶆柊鍚屾鎸夐挳
form.on('submit(btnResCnz)', function (data) {
var HBillno2 = $('#HBillno2').val();
@@ -582,6 +602,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index 96c5909..51202cd 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -94,7 +94,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;display:none;">
瀹℃牳
</button>
</div>
@@ -103,7 +103,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -112,7 +112,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -121,7 +121,7 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px; display: none;">
瀹℃牳
</button>
</div>
@@ -155,7 +155,6 @@
</div>
</div>
<script>
- var params = get_UrlVars();
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -174,8 +173,7 @@
var optionNeedCheck = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
- "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HCheckFlowStatusID", "HCheckFlowID","HCheckItemID"];
+ var titleData = ["hmainid"];
//#endregion
//#endregion
var HModName = "PM_ProjectTaskNeedCheckQuery";
@@ -183,8 +181,8 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display();
+
+ get_FastQuery();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -195,7 +193,7 @@
//case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
// break;
//鍒锋柊
- case 'get_Refresh': get_Display();
+ case 'get_Refresh': get_FastQuery();
break;
//瀵煎嚭excel
case 'get_export':
@@ -212,7 +210,7 @@
table.exportFile(ins.config.id, optionNeedCheck.data, "xls");
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_Display);
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_FastQuery);
break;
};
});
@@ -312,6 +310,17 @@
//#endregion
//#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ //鍒濆璇濇寜閽偣鍑�
+ sWhere = " '"+addSWhereByOpenType() + "'";
+ //鏌ヨ
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
//#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
//璁剧疆瀹℃牳鎸夐挳涓嶅彲鐐瑰嚮
@@ -319,7 +328,6 @@
$('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
$('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
$('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
-
optionNeedCheck = {
elem: '#mainTableNeedCheck'
, toolbar: '#toolbarDemoNeedCheck'
@@ -347,13 +355,13 @@
//#endregion
//#region 鍔犺浇琛ㄦ牸
- function get_Display() {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
type: "GET",
async: false,
- data: {"user": sessionStorage["HUserName"] },
+ data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -539,7 +547,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display();
+ get_FastQuery();
});
} else {
@@ -556,6 +564,44 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ var addSWhere = openType;
+ //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
+ if (openType == "SetupMoney") {
+ $('#btnCheckSetupMoney').show();
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "OtherMoney") {
+ $('#btnCheckOtherMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ } else if (openType == "ExamMoney") {
+ $('#btnCheckExamMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "WorkMoney") {
+ $('#btnCheckWorkMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else {
+ addSWhere="other"
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ }
+ return addSWhere;
+ }
+ //#endregion\
+
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
index 100082f..a638680 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
@@ -94,10 +94,10 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -106,10 +106,10 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -118,10 +118,10 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -130,10 +130,10 @@
<label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" >
- <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left; display: none;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px; display: none;">
淇濆瓨
</button>
</div>
@@ -193,8 +193,8 @@
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
- get_Display();
+
+ get_FastQuery();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -205,7 +205,7 @@
//case 'btn-Edit': get_ShowBill('mainTableNeedSave');
// break;
//鍒锋柊
- case 'get_Refresh': get_Display();
+ case 'get_Refresh': get_FastQuery();
break;
//瀵煎嚭excel
case 'get_export':
@@ -222,7 +222,7 @@
table.exportFile(ins.config.id, optionNeedSave.data, "xls");
break;
//鍒楄缃�
- case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_Display);
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_FastQuery);
break;
};
});
@@ -345,6 +345,17 @@
//#endregion
//#region 璇ラ〉闈㈡墍鏈夋柟娉�
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ //鍒濆璇濇寜閽偣鍑�
+ sWhere = " '" + addSWhereByOpenType() + "'";
+ //鏌ヨ
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
//#region 鍒濆鍖栬〃鏍�
function set_InitGrid() {
//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐐瑰嚮
@@ -380,13 +391,13 @@
//#endregion
//#region 鍔犺浇琛ㄦ牸
- function get_Display() {
+ function get_Display(sWhere) {
var ajaxLoad = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
type: "GET",
async: false,
- data: {"user": sessionStorage["HUserName"] },
+ data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -572,7 +583,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display();
+ get_FastQuery();
});
} else {
@@ -715,7 +726,49 @@
})
}
//#endregion
-
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ var addSWhere = openType;
+ //鏍规嵁閫掑叆鍙傛暟闅愯棌瀵瑰簲鎸夐挳鍜屾樉绀哄垪
+ if (openType == "SetupMoney") {
+ $('#btnSaveSetupMoney').show();
+ $('#btnSearchHTaskSetupMoney').show();
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "OtherMoney") {
+ $('#btnSaveOtherMoney').show();
+ $('#btnSearchHTaskOtherMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ } else if (openType == "ExamMoney") {
+ $('#btnSaveExamMoney').show();
+ $('#btnSearchHTaskExamMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else if (openType == "WorkMoney") {
+ $('#btnSaveWorkMoney').show();
+ $('#btnSearchHTaskWorkMoney').show();
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ } else {
+ addSWhere = "other"
+ //titleData.push("浠诲姟瀹夎璐瑰鏍�");
+ //titleData.push("浠诲姟宸ヨ垂瀹℃牳");
+ //titleData.push("浠诲姟鑰冩牳璐瑰鏍�");
+ //titleData.push("浠诲姟闄勫睘璐瑰鏍�");
+ }
+ return addSWhere;
+ }
+ //#endregion\
+
+ //#endregion
//#endregion
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
index 3520629..e9841ea 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBillList.html"
@@ -307,6 +307,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '椤圭洰闃舵姹囨姤-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -427,6 +447,13 @@
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 if ($.inArray(data[i].name, totalArray) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
} else {
--
Gitblit v1.9.1