From e8aa5b7991595f8b5bdb3e862cfa668cf96fa0ff Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 25 十一月 2024 17:34:26 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 2
WebTM/views/采购管理/付款单/YF_PayMentBillList.html | 120
WebTM/views/采购管理/采购报表/Cg_POOrderInStockSumReport.html | 553 ++++
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 316 ++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_EnvironmentTestItem.html | 297 ++
WebTM/views/质量管理/质量报表/SB_TechnologyParameterList.html | 303 +
WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList_PDA.html | 739 ++++++
WebTM/views/人事管理/人员履历/HR_PersonnelResumeList.html | 42
WebTM/views/基础资料/公用基础资料/excel/Gy_EnvironmentTestItem_Excel.html | 227 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 3
WebTM/views/采购管理/应付单/Cg_PayableBillList.html | 120
WebTM/views/工资管理/工资报表/Pay_PayrollReportByKD.html | 604 ++++
WebTM/views/index_Mobile.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 55
WebTM/views/采购管理/收料通知单/Cg_POInStockBillQuery.html | 35
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 7
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 22
WebTM/views/车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html | 32
WebTM/views/车间管理/关键件绑定/Sc_KeyElementBindingList.html | 62
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 276 +
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 2
WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html | 36
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillQuery.html | 36
WebTM/views/销售管理/应收单/Xs_ReceivableBillQuery.html | 35
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 20
WebTM/views/销售管理/销售订单/Xs_SeOrderBillQuery.html | 36
WebTM/views/领料发货/销售出库/Kf_SellOutBillQuery.html | 36
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 202 +
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 158 +
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 154
WebTM/views/销售管理/销售报表/Xs_SeOrderOutStockSumReport.html | 553 ++++
WebTM/views/验收入库/外购入库/Kf_POStockInBillListQuery.html | 36
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 125
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 41
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 442 +++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 124
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 8
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 22
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 328 ++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 60
WebTM/views/基础资料/公用基础资料/Gy_EnvironmentTestItem.html | 843 ++++++
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 178 +
WebTM/WebTM.csproj | 7
44 files changed, 6,830 insertions(+), 477 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 41110f5..17feb8c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -355,17 +355,20 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_EnvironmentTestItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TechnologyParameterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MaintainLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_CheckItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectBasis_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectInstruMent_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectMethod_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_EnvironmentTestItem_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_InspectValue_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QCCheckClass_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\excel\Gy_QualityStd_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckNoteItem_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PreventErrMould_Excel.html" />
@@ -415,6 +418,7 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayrollReportByKD.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentEntryReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PayWorkShopSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_PaymentDayCheckReport.html" />
@@ -472,6 +476,7 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
@@ -631,6 +636,7 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POInStockBillSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
<Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昣鏂癨Xs_OutDoorBill.html" />
@@ -640,6 +646,7 @@
<Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBillQuery.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Add_Edit_Xs_ContractBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_PM_CustomerProInfoBill.html" />
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_TaskClass.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 35c1a7f..9bf7058 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,13 +6,11 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- /*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
- //var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 9cc20ed..2e1978c 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -181,6 +181,12 @@
</a>
</dd>
<dd>
+ <a href="鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList_PDA.html" target="main_self_frame" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 寮�宸ュ崟
+ </a>
+ </dd>
+ <dd>
<a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBillList_PDA_QiaoYi.html?type=czd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭鍑虹珯姹囨姤鍗曞垪琛ㄦ煡璇�
diff --git "a/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html" "b/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html"
index 0f39c7c..b19bd9a 100644
--- "a/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html"
+++ "b/WebTM/views/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeList.html"
@@ -63,12 +63,12 @@
<table class="layui-hide" id="mainTable_people" lay-filter="mainTable_people"></table>
</div>
<div class="layui-tab-item">
- <!--鎶�鑳界瓑绾�-->
- <table class="layui-hide" id="mainTable_skill" lay-filter="mainTable_skill"></table>
+ <!--鎶�鑳借�冩牳-->
+ <table class="layui-hide" id="mainTable_examine" lay-filter="mainTable_examine"></table>
</div>
<div class="layui-tab-item">
<!--鑰冩牳璁板綍-->
- <table class="layui-hide" id="mainTable_examine" lay-filter="mainTable_examine"></table>
+ <table class="layui-hide" id="mainTable_skill" lay-filter="mainTable_skill"></table>
</div>
</div>
</div>
@@ -100,14 +100,16 @@
var sWhere = "";
var Number = "";
var Name = "";
+ var HProcID = "";
var option_people = ""; //鑱屽憳淇℃伅
- var option_examine = ""; //鑰冩牳璁板綍
- var option_skill = ""; //鎶�鑳界瓑绾�
+ var option_examine = ""; //鎶�鑳界瓑绾�
+ var option_skill = ""; //鎴愮哗鑰冩牳
var ins;
var params = get_UrlVars();
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡鎵撳紑鍩虹璧勬枡鍒楄〃
Number = params[params[1]] == null ? "" : params[params[1]]; //浠ｇ爜
Name = params[params[2]] == null ? "" : params[params[2]]; //鍚嶇О
+ HProcID = params[params[3]] == null ? "" : params[params[3]]; //鍚嶇О
Number = decodeURI(Number);
Name = decodeURI(Name);
//#endregion
@@ -156,13 +158,24 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HNumber = $("#HNumber").val() != "" ? "" : Number;
- var HName = $("#HName").val() != "" ? "" : Name;
- sWhere = {
- HNumber: HNumber,
- HName: HName
+ var HNumber = $("#HNumber").val() != "" ? $("#HNumber").val() : Number;
+ var HName = $("#HName").val() != "" ? $("#HName").val() : Name;
+ if (OperationType == 2) {
+ sWhere = {
+ HNumber: HNumber,
+ HName: HName,
+ HProcID: HProcID
+ }
+ get_Display(JSON.stringify(sWhere));
+ } else {
+ sWhere = {
+ HNumber: HNumber,
+ HName: HName,
+ HProcID: ""
+ }
+ get_Display(JSON.stringify(sWhere));
}
- get_Display(JSON.stringify(sWhere));
+
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -193,7 +206,7 @@
//table.render(option);
}
- //鍒濆鍖栬�冩牳璁板綍鍒楄〃
+ //鍒濆鍖栨妧鑳借�冩牳鍒楄〃
function set_InitGrid_examine() {
option_examine = {
elem: '#mainTable_examine'
@@ -206,7 +219,7 @@
};
}
- //鍒濆鍖栨鍦ㄧ户缁垪琛�
+ //鍒濆鍖栨垚缁╄�冩牳鍒楄〃
function set_InitGrid_skill() {
option_skill = {
elem: '#mainTable_skill'
@@ -274,6 +287,7 @@
table.render(option_people);
ins = table.render(option_people);
+ //鎶�鑳借�冩牳
option_examine = {
elem: '#mainTable_examine'
, toolbar: '#toolbarDemo'
@@ -287,7 +301,7 @@
, cellMinWidth: 90
}
table.render(option_examine);
-
+ //鎴愮哗璁板綍
option_skill = {
elem: '#mainTable_skill'
, toolbar: '#toolbarDemo'
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_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/Add_Edit_Gy_EnvironmentTestItem.html"
new file mode 100644
index 0000000..5844c84
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_EnvironmentTestItem.html"
@@ -0,0 +1,297 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏂板/缂栬緫鐜妫�娴嬪崟</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+
+ <h1 style="text-align:center;"><b>鐜妫�娴嬪崟</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HName" id="HName" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+ <div class="layui-input-inline">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ </select>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+ <option value="鏈娴�" selected>鏈娴�</option>
+ <option value="鏈娇鐢�">鏈娇鐢�</option>
+ <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-xs11">
+ <label class="layui-form-label"> 澶囨敞锛�</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //#endregion
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid();
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ if (!AllowLoadData()) {
+ return;
+ }
+ var isEndCheck = document.getElementById("HStopflag").checked;
+ isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveGy_EnvironmentTestItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+ //#endregion
+
+
+ //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Organ();
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ $("#HItemID").val("0");
+ $("#HNumber").val("");
+ }
+ //缂栬緫
+ function set_EditFromGrid() {
+ $("#HItemID").val(linterid);
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ }
+ //缂栬緫鍔犺浇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "GetGy_EnvironmentTestItem_Edit",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Gy_EnvironmentTestItem[0];
+ $("#HItemID").val(data.HItemID);//浠ｇ爜ID
+ $("#HNumber").val(data.妫�娴嬩唬鐮�);//浠ｇ爜
+ $("#HName").val(data.妫�娴嬪悕绉�);//鍚嶇О
+ $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+ $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+ $("#HRemark").val(data.澶囨敞);//澶囨敞
+ $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ //
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ function Organ() {
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+
+ if (HNumber == null || HNumber == undefined || HNumber == "") {
+ layer.msg("璇疯緭鍏ヤ唬鐮侊紒", { icon: 5 });
+ return false;
+ }
+ if (HName == null || HName == undefined || HName == "") {
+
+ layer.msg("璇疯緭鍏ュ悕绉帮紒", { icon: 5 });
+ return false;
+ }
+
+ return true;
+ }
+
+ //#endregion
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\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"
new file mode 100644
index 0000000..1a8a596
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EnvironmentTestItem.html"
@@ -0,0 +1,843 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐜妫�娴嬪崟</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妫�娴嬩唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妫�娴嬪悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Gy_EnvironmentTestItem";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+
+ //#endregion
+ //琛岀偣鍑�
+ 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;
+ }
+ });
+ })
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //瀵煎叆
+ case 'set_SouceExcel': set_SouceExcel();
+ break;
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_EnvironmentTestItem";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+ };
+ }
+
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ 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_EnvironmentTestItem.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");
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BadReason/Gy_EnvironmentTestItemList',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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', totalRowText: '鍚堣琛�'});
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if ($.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 {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_EnvironmentTestItem";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ 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 + "%'";
+ }
+ if (HName) {
+ sWhere += " and 妫�娴嬪悕绉� like '%" + HName + "%'";
+ }
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+
+
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //瀵煎叆
+ function set_SouceExcel() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐜妫�娴嬪崟瀵煎叆'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_EnvironmentTestItem_Excel.html?OperationType=dao&HSouceBillType='
+ })
+ }
+
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐜妫�娴嬪崟',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_EnvironmentTestItem.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+
+ //缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐜妫�娴嬪崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_EnvironmentTestItem.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HItemID = data[0].HItemID.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "DeltetGy_EnvironmentTestItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/AuditGy_EnvironmentTestItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_BadReason/StopGy_EnvironmentTestItem", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#endregion
+ //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+
+ form.render('select');
+ }
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </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/excel/Gy_EnvironmentTestItem_Excel.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/excel/Gy_EnvironmentTestItem_Excel.html"
new file mode 100644
index 0000000..3e59c8a
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/excel/Gy_EnvironmentTestItem_Excel.html"
@@ -0,0 +1,227 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐜妫�娴嬪崟瀵煎叆</title>
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ , upload = layui.upload
+
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/Gy_EnvironmentTestItem/Gy_EnvironmentTestItem_Excel',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ done: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+ //#endregion
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: '妫�娴嬩唬鐮�', title: '妫�娴嬩唬鐮�' }
+ , { field: '妫�娴嬪悕绉�', title: '妫�娴嬪悕绉�' }
+ , { field: '澶囨敞', title: '澶囨敞' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ //DisPlay_HideColumn();
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ var oldData = option.data;
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
+ layer.close(index);
+ }
+ });
+ }
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ num.push(option.data[i])
+ }
+ }
+
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Gy_EnvironmentTestItem/Gy_EnvironmentTestItem_btnSave",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg(data.Message);
+ option.data = null;
+ table.cache["mainTable"] = null;
+ table.render(option);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayrollReportByKD.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayrollReportByKD.html"
new file mode 100644
index 0000000..0003498
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_PayrollReportByKD.html"
@@ -0,0 +1,604 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ヨ祫鎶ヨ〃锛堥噾铦讹級</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/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/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</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">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿</label>
+ <div class="layui-input-block" style="width: 190px;">
+ <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
+ <!--鍔ㄦ�佹覆鏌撻儴闂�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐝粍</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HGroupName" id="HGroupName" style="width:215px;">
+ </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="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </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="HMaterName" id="HMaterName" style="width:190px;">
+ </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="HMaterModel" id="HMaterModel" style="width:170px;">
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">瀵煎嚭</button>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option = [];
+ var HModName = "Pay_PayrollReportByKD";
+ var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//瀛愯〃涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ // 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //閲嶇疆
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //瀵煎嚭
+ form.on('submit(get_export)', function (data) {
+ 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, '').replaceAll(',','锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ });
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ DeptName();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //鐢熶骇杞﹂棿
+ function DeptName() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-110'
+ , page: true
+ , totalRow: true
+ , limit: 500
+ , data:[]
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ };
+ table.render(option);
+ }
+
+ // 鏌ヨ
+ function get_Display(sWhere) {
+
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Pay_PayrollReportByKD/list',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '璁＄畻', hide: true });
+ 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: true, totalRow: true});
+ } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-110'
+ , page: false
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 500
+ , limits: [50, 500, 5000, 20000]
+ , done: function () {
+
+ }
+ }
+ ins = table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HDeptID = $("#HDeptName").val();
+ var HGroupName = $("#HGroupName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterModel = $("#HMaterModel").val();
+
+ //if (HBeginDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ //}
+ //if (HEndDate) {
+ // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ //}
+ //if (HDeptID && HDeptID != 0) {
+ // sWhere += "and HDeptID = " + HDeptID;
+ //}
+ //if (HGroupName) {
+ // sWhere += " and 鐝粍 like '%" + HGroupName + "%'";
+ //}
+ //if (HMaterNumber) {
+ // sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ //}
+ //if (HMaterName) {
+ // sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ //}
+ //if (HMaterModel) {
+ // sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
+ //}
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HDeptID: HDeptID
+ , HGroupName: HGroupName
+ , HMaterNumber: HMaterNumber
+ , HMaterName: HMaterName
+ , HMaterModel: HMaterModel
+ }
+
+ set_InitGrid();
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ function set_ClearQuery() {
+ $("#HInitTimeCycle").val(29)
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ $("#HDeptName").val("0");
+ $("#HGroupName").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+
+ //闅愯棌鍒楄缃�
+ 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);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 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 });
+ }
+ })
+ }
+
+ // 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ 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("29");
+ }
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index 07be9b5..cc6e01c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -707,18 +707,22 @@
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < tableSub.length; i++) {
- rowdata.push(
- {
- "HRelationBillInterID": tableSub[i].HRelationBillInterID, "HRelationBillEntryID": tableSub[i].HRelationBillEntryID, "HRelationBillNo": tableSub[i].HRelationBillNo, "HRelationBillType": tableSub[i].HRelationBillType,
- "HICMOInterID": tableSub[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": tableSub[i].鐢熶骇璁㈠崟瀛愬唴鐮�, "HICMOBillNo": tableSub[i].鐢熶骇璁㈠崟, "HRemark": tableSub[i].澶囨敞,
- "HProcExchInterID": tableSub[i].HProcExchInterID, "HProcExchEntryID": tableSub[i].HProcExchEntryID, "HProcExchBillNo": tableSub[i].HProcExchBillNo,
- "HMaterID": tableSub[i].HMaterID, "HMaterName": tableSub[i].浜у搧鍚嶇О, "HProcID": tableSub[i].HProcID, "HProcName": tableSub[i].宸ュ簭鍚嶇О,
- }
- )
+ if (tableSub[0].HRelationBillInterID!=null) {
+ for (var i = 0; i < tableSub.length; i++) {
+ rowdata.push(
+ {
+ "HRelationBillInterID": tableSub[i].HRelationBillInterID, "HRelationBillEntryID": tableSub[i].HRelationBillEntryID, "HRelationBillNo": tableSub[i].HRelationBillNo, "HRelationBillType": tableSub[i].HRelationBillType,
+ "HICMOInterID": tableSub[i].鐢熶骇璁㈠崟鍐呯爜, "HICMOEntryID": tableSub[i].鐢熶骇璁㈠崟瀛愬唴鐮�, "HICMOBillNo": tableSub[i].鐢熶骇璁㈠崟, "HRemark": tableSub[i].澶囨敞,
+ "HProcExchInterID": tableSub[i].HProcExchInterID, "HProcExchEntryID": tableSub[i].HProcExchEntryID, "HProcExchBillNo": tableSub[i].HProcExchBillNo,
+ "HMaterID": tableSub[i].HMaterID, "HMaterName": tableSub[i].浜у搧鍚嶇О, "HProcID": tableSub[i].HProcID, "HProcName": tableSub[i].宸ュ簭鍚嶇О,
+ }
+ )
+ }
+
}
option.data = rowdata;
table.render(option);
+
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
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 abadad5..03ef44c 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"
@@ -266,10 +266,10 @@
columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true});
columns.push({ field: 'FMATERIALNAME', title: '鐗╂枡鍚嶇О', sort: true});
columns.push({ field: 'FSPECIFICATION', title: '鐗╂枡瑙勬牸', sort: true});
- columns.push({ field: 'FNAME', title: '渚涘簲鍟�', sort: true});
- columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true});
- columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true});
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true});
+ columns.push({ field: 'FNAME', title: '渚涘簲鍟�', sort: true });
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, hide: true });
+ columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true, hide: true });
+ columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true, hide: true });
//columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
//columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
//columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
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_MESBeginWorkBillList_PDA.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_MESBeginWorkBillList_PDA.html"
new file mode 100644
index 0000000..f608845
--- /dev/null
+++ "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_MESBeginWorkBillList_PDA.html"
@@ -0,0 +1,739 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title class="sckgd">鐢熶骇寮�宸ュ崟</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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+ .layui-input {
+ height: 30px;
+ }
+ /*璁剧疆琛ㄥご杈撳叆妗�*/
+ .t1_input {
+ padding: 1%;
+ }
+ /*鏈珯淇℃伅td*/
+ .bz_td {
+ display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+ padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+ }
+ /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+ .bz_btu {
+ height: 30px;
+ width: 60px;
+ line-height: 30px;
+ }
+
+ th {
+ width: 70px;
+ text-align: center;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;" class="jzd"><i class="layui-icon layui-icon-form"></i>鐢熶骇寮�宸ュ崟</span>
+ </div>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鏉″舰鐮�</th>
+ <td class="bz_td">
+ <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ <tr>
+ <th>璁惧</th>
+ <td class="bz_td">
+ <input type="text" name="HEquipName" class="layui-input" id="HEquipName" placeholder="璇锋壂鎻忚澶囦簩缁寸爜" style="border-radius: 50px;">
+ <input type="hidden" name="HEquipID" id="HEquipID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>婧愬崟鍗曞彿</th>
+ <td class="bz_td">
+ <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="border-radius: 50px;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="border-radius: 50px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="border-radius: 50px;">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璁㈠崟</th>
+ <td class="bz_td">
+ <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="border-radius: 50px;">
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="0" style="border-radius: 50px;">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="0" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇璧勬簮</th>
+ <td class="bz_td">
+ <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+
+ <tr>
+ <th>娴佹按鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="閫夋嫨娴佹按鍙�" style="background-color:#efefef4d;border-radius: 50px;">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>褰撳墠宸ュ簭</th>
+ <td class="bz_td">
+ <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧浠ｇ爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠ｇ爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ <tr>
+ <th>寮�宸ユ椂闂�</th>
+ <td class="bz_td">
+ <input type="text" name="HBeginWorkTime" class="layui-input" id="HBeginWorkTime" value="0" placeholder="" style="border-radius: 50px;">
+ </td>
+ </tr>
+ <tr>
+ <th>鐢熶骇鐝粍</th>
+ <td class="bz_td">
+ <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;border-radius: 50px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鎿嶄綔鍛�</th>
+ <td class="bz_td">
+ <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>杞﹂棿</th>
+ <td class="bz_td">
+ <input type="text" name="HDeptName" class="layui-input set_height" id="HDeptName" placeholder="閫夋嫨杞﹂棿" style="border-radius: 50px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" value="0" autocomplete="off" class="layui-input set_height">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btnHDept" id="btnHDept" style="font-weight:bolder;">...</button>
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鏃ユ湡</th>
+ <td class="t1_input">
+ <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
+ </td>
+ </tr>
+ <tr>
+ <th>鍗曟嵁鍙�</th>
+ <td class="bz_td">
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>鍒跺崟浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍒跺崟鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>淇敼鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>瀹℃牳鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍏抽棴浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>鍏抽棴鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾浜�</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th>浣滃簾鏃ユ湡</th>
+ <td class="bz_td">
+ <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍗曟嵁淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
+ </div>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngProcInterID" id="lngProcInterID">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+ <input type="hidden" name="eventType" id="eventType" value="Add">
+ <input type="hidden" name="HeqSouID" id="HeqSouID" value="0">
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ var params = get_UrlVars();
+ var option = [];
+ var titleData = [];
+
+
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HBillNo = params[params[3]];//鍗曟嵁鍙�
+ var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ }
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1 || OperationType == 2 || OperationType == 5) {
+ //鑾峰彇鏈�澶у崟鎹彿
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3787' },
+ success: function (d) {
+ $("#HInterID").val(0);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ layer.close(ajaxLoad);
+ }
+ , error: function () {
+ layer.close(ajaxLoad);
+ layer.msg("鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇峰埛鏂伴噸璇曪紒");
+ }
+ });
+
+ GetDefValByUser();
+ }
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 纭畾鎸夐挳
+ form.on('submit(QueDin)', function (data) {//
+ var HBarCode = $('#HBarCode').val();
+
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+
+ });
+ //#endregion
+
+ //#region 鏂板鎸夐挳
+ form.on('submit(Add)', function () {//鎻愪氦
+ layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ location.replace('Sc_MESBeginWorkBillList_PDA.html?type=' + params[params[0]]);
+ });
+ })
+ //#endregion
+
+ //#region 淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ var HSouId1 = $("#HeqSouID").val();//璁惧瀵瑰簲鐨勭敓浜ц祫婧�
+ var HSouId2 = $("#HSourceID").val();//娲惧伐鍗曞搴旂殑鐢熶骇璧勬簮
+ var refSav = "";
+ if (OperationType == 1) {
+ refSav = "Add";
+ } else {
+ refSav = "Update";
+ }
+ if ($("#HEquipID").val()=="0") {
+ layer.msg("璁惧鏈壂鎻�");
+ return;
+ }
+ if ($("#HProcID").val() == "0") {
+ layer.msg("娴佹按鍙锋湭閫夋嫨");
+ return;
+ }
+ if (HSouId1 != HSouId2) {
+ layer.msg("褰撳墠娴佽浆鍗℃淳宸ョ殑鐢熶骇璧勬簮绾夸笌褰撳墠璁惧鐨勭敓浜ц祫婧愬涓嶄笂!!!");
+ return;
+ } else {
+ var msg = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + refSav;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveSc_MESBeginWorkBill",
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HInterID").val(result.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ if (result.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(sessionStorage["HUserName"]); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ });
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ });
+ //#endregion
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify(HName) {
+ var InterID = $("#HInterID").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": HName },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+ function GetDefValByUser() {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+ type: "GET",
+ data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+
+ form.val("formData", {
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+ "HEmpID": data.HEmpID,
+ "HEmpName": data.鎿嶄綔鍛樺悕绉�
+ });
+ layer.close(index);
+ }
+ , error: function () {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触");
+ }
+ })
+ }
+ //#endregion
+
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HBeginWorkTime").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ //鎵爜绫诲瀷1
+ var barNo = HBarCode.substr(0, 3);
+ if (barNo !="GXL") {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#HEquipID").val(data.HInterID);
+ $("#HEquipName").val(data.璁惧鍚嶇О);
+ $("#HeqSouID").val(data.HSourceID);
+ layer.close(index);
+ return;
+ }
+ else {
+ $("#HBarCode").val("");
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ $("#HBarCode").val("");
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ } else {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetHProcExchInterID",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOInterID": data.HICMOEntryID,
+ "HICMOBillNo": data.HICMOBillNo,
+ "HMaterID": data.HMaterID,
+ "HMaterNumber": data.HMaterNumbers,
+ "HMaterName": data.HMaterName,
+ "HDeptID": data.HDeptID,
+ "HDeptName": data.HDeptName,
+ "HMainSourceInterID": data.HInterID, //鐢熶骇鐘舵�佷复鏃惰〃鍐呯爜
+ "HMainSourceEntryID": data.HSourceEntryID,
+ "HMainSourceBillNo": data.HSourceBillNo,
+ "HMainSourceBillType": data.HBillType,
+ "lngProcInterID": data.HSourceInterID //娴佽浆鍗″唴鐮� 鏌ヨ宸ュ簭
+ });
+ HProcExchBillNoFlag = true;
+
+ layer.close(index);
+ //娓呯┖鏉＄爜妗�
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ }
+
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HMainSourceBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
+ });
+
+ function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HSourceID": data.HSourceID,
+ "HSourceName": data.鐢熶骇璧勬簮
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+
+ //閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鏈珯宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ console.log($('#HProcNo').val())
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鎿嶄綔浜�
+ form.on('submit(HEmployeeID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨娴佹按鍙峰脊绐�
+ form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+ var value = $("#lngProcInterID").val();
+ // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+ if (value) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '娴佹按鍙�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ , end: function () {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HMainSourceBillNo').val();
+ if (sProcNo != "") {
+ txtHProcNo_KeyDown(sBillNo, sProcNo);
+ }
+ }
+ })
+ } else {
+ layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
+ }
+ });
+
+ //閫夋嫨閮ㄩ棬寮圭獥
+ form.on('submit(btnHDept)', function () {//閮ㄩ棬
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+ //杩斿洖娴佹按鍙�
+ function GetProcNoValue(obj) {
+ $("#HProcNo").val(obj[0].娴佹按鍙�);
+ }
+
+ //杩斿洖鐢熶骇鐝粍
+ function GetProductionTeamValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+
+ //杩斿洖鐢熶骇璧勬簮
+ function GetProductionResourcesValue(obj) {
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ }
+ //杩斿洖鎿嶄綔鍛�
+ function GetHWorkerValue(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖褰撳墠宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖褰撳墠宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 5feda21..418dfbc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -549,6 +549,13 @@
var row = [];
for (var i = 0; i < table.cache['mainTable'].length; i++) {
if (table.cache['mainTable'][i] != "") {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterSpec.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterSpec.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterSpec = table.cache["mainTable"][i].HMaterSpec.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
row.push(table.cache['mainTable'][i])
}
}
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 2372bd9..ac91e0c 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"
@@ -1184,7 +1184,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": ""
+ "HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "涓诲伐搴�", "HCenterID_S": 0, "HCenterID_SName": "","宸ュ簭浠ｇ爜":""
, "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
, "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "宸ュ簭": "","宸ユ":""
, "HProcID": 0, "宸ヤ綔涓績浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績": "", "HSupID": 0
@@ -1373,12 +1373,12 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
const procNos = table.cache["mainTable"].map(item => item.HProcNo);
- if (isSortedAscending(procNos)) {
+ if (isSortedAscending(procNos) && haveHProcNO9999()) {
if (AllowLoadData(data)) {
set_AddNew(data);
}
} else {
- layer.msg('璇锋敞鎰忔祦姘村彿娆″簭');
+ layer.msg('璇锋敞鎰忔祦姘村彿娆″簭鎴栬�呮槸鍚︽湁杞伐搴�');
}
});
// 鍑芥暟锛氬垽鏂暟缁勬槸鍚︿粠灏忓埌澶ф帓搴�
@@ -1387,6 +1387,18 @@
if (arr[i] > arr[i + 1]) {
return false;
}
+ }
+ return true;
+ }
+ //澶嶅埗鏃朵繚璇佽浆宸ュ簭瀛樺湪
+ function haveHProcNO9999() {
+ if (OperationType == 2 || OperationType == 3) {
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HProcNo"] == 9999 && option.data[i]["宸ュ簭浠ｇ爜"] == 9999) {
+ return true
+ }
+ }
+ return false;
}
return true;
}
@@ -2909,7 +2921,9 @@
//鍒锋柊娴佹按鍙�
function btn_Refresh(data) {
for (var i = 0; i < option.data.length; i++) {
- option.data[i]["HProcNo"] = (i + 1) * 10;
+ if (option.data[i]["HProcNo"] != 9999) {
+ option.data[i]["HProcNo"] = (i + 1) * 10;
+ }
}
table.render(option);
}
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 194b1c7..c31b52d 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"
@@ -1067,31 +1067,36 @@
var hmainid = data[0].hmainid;
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
- type: "GET",
- data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
- success: function (result) {
- console.log('gouba' + result);
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
+ if (data[0].鐘舵�� == "鍒涘缓" || data[0].鐘舵�� == "瀹℃牳閫�鍥�" ) {
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
layer.close(wait);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
+ });
+ } else {
+ layer.msg('鍗曟嵁鐘舵�佹湭鍦ㄥ垱寤�');
+ layer.close(wait);
+ }
})
}
@@ -1410,11 +1415,12 @@
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Gy_RoutingBillList_ExportExcel";
-
+ var wait = layer.load();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
@@ -1431,11 +1437,14 @@
});
if (result.count == 1) {
table.exportFile(ins.config.id, data, "xls");
+ layer.close(wait);
} else {
layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ layer.close(wait);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
});
}
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 762ce7e..cd9b02d 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"
@@ -1284,14 +1284,44 @@
var field = cell.data('field'); // 鑾峰彇瀛楁
var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
- // 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ // 浣跨敤layui鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
var updatedData = table.cache['mainTable'].map(function (item) {
- if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤numbers鍒楃储寮曞畾浣�
item[field] = newValue;
}
return item;
});
+ // 鑾峰彇褰撳墠琛屾暟鎹�
+ var currentRowData = table.cache['mainTable'].find(function (item) {
+ return item.LAY_TABLE_INDEX === rowIndex;
+ });
+
+ // 鍋囪杩欓噷瑕佸垽鏂殑瀛楁鏄� 'HVaule'锛屼綘鍙互鏍规嵁瀹為檯闇�姹備慨鏀硅鍒ゆ柇鐨勫瓧娈靛悕
+ if (field === 'HVaule') {
+ var valueToCheck = parseFloat(newValue);
+ var lowerLimit = parseFloat(currentRowData.HMin);
+ var upperLimit = parseFloat(currentRowData.HMax);
+
+ // 寰幆閬嶅巻褰撳墠琛屼笂涓嬮檺鏁版嵁骞惰繘琛屽垽鏂紙杩欓噷鍏跺疄涓昏鏄垽鏂綋鍓嶈鐨勪笂涓嬮檺涓庢洿鏂板�肩殑鍏崇郴锛�
+ if (valueToCheck >= lowerLimit && valueToCheck <= upperLimit) {
+ // 鏇存柊褰撳墠琛岀殑HResult涓篛K
+ currentRowData.HResult = 'OK';
+ } else {
+ currentRowData.HResult = 'NG';
+ }
+ }
+
+ checkRefresh();
+
+ //// 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ //var updatedData = table.cache['mainTable'].map(function (item) {
+ // if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ // item[field] = newValue; // 鏇存柊瀛楁鍊�
+ // item.HResult = hResult; // 鏇存柊妫�娴嬬粨鏋�
+ // }
+ // return item;
+ //});
//layui.table.reload('mainTable', {
// data: updatedData
//});
@@ -1417,9 +1447,9 @@
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
//鐘舵��
- $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").prop("selected", true);
}
- form.render('select');
+ form.render('select');
}
//#endregion
@@ -1474,6 +1504,13 @@
});
var rowdata = [];
for (var i = 0; i < result.data.length; i++) {
+ // 鑾峰彇褰撳墠鐨勬暟閲囧�笺�佷笂闄愬�煎拰涓嬮檺鍊硷紝骞剁‘淇濆畠浠槸鏁板�肩被鍨�
+ var value = parseFloat(result.data[i]["鏁伴噰鍊�"]);
+ var max = parseFloat(result.data[i]["涓婇檺鍊�"]);
+ var min = parseFloat(result.data[i]["涓嬮檺鍊�"]);
+
+ // 鍒ゆ柇 HResult 鐨勫��
+ var hResult = (value <= max && value >= min) ? "OK" : "NG";
rowdata.push(
{
"HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
@@ -1492,13 +1529,14 @@
"HStd": result.data[i]["鏍囧噯鍊�"],
"HMax": result.data[i]["涓婇檺鍊�"],
"HMin": result.data[i]["涓嬮檺鍊�"],
- "HRemark": result.data[i]["閲囬泦鏉ユ簮"]
+ "HRemark": result.data[i]["閲囬泦鏉ユ簮"],
+ "HResult": hResult
}
);
}
option.data = rowdata;
-
table.render(option);
+ checkRefresh();
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1690,7 +1728,7 @@
}
});
}
- //#endregion
+ //#endregion
});
@@ -1777,10 +1815,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟浠ｇ爜/鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null) {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
}
}
else {
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_FiveMenOneRingList.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_FiveMenOneRingList.html"
index 20ff078..c436455 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_FiveMenOneRingList.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_FiveMenOneRingList.html"
@@ -234,7 +234,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id","璁惧id","宸ュ簭id"];
+ var titleData = ["娴佽浆鍗d", "鐢熶骇璁㈠崟", "鐗╂枡浠ｇ爜", "瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id","璁惧id","宸ュ簭id","娴佽浆鍗d"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -740,7 +740,8 @@
success: function (data1) {
if (data1.count == 1) {
var linterid = data1.data[0].hmainid;
- getTable_Right(linterid);
+ var SNs = "";
+ getTable_Right(linterid, SNs);
layer.close(ajaxLoad);
} else {
@@ -812,14 +813,14 @@
//#region 涓昏〃鏍� 娴佽浆鍗＄偣鍑讳簨浠�
table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
- var ajaxLoad = layer.load();
+ var data = obj.data;
var linterid;
+ var SNs = $("#SN").val();
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- linterid = data.娴佽浆鍗d;
- }
- getTable_Right(linterid);
+ linterid = data.娴佽浆鍗d;
+ getTable_Right(linterid, SNs);
+ }
});
//#endregion
@@ -878,7 +879,7 @@
table.on('tool(mainTable_Man)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
- if (data.鍗曟嵁绫诲瀷=="宸ュ簭鍑虹珯鍗�") {
+ if (data.鍗曟嵁绫诲瀷=="姹囨姤鍗�") {
var linterid = data.鍗曟嵁涓籭d;
var HBillNo = data.鍗曟嵁鍙�;
layer.open({
@@ -990,6 +991,7 @@
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -998,7 +1000,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName+''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID +''
, resize: false,
end: function () {
}
@@ -1173,6 +1175,7 @@
})
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1181,7 +1184,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1213,6 +1216,7 @@
})
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1221,7 +1225,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1236,23 +1240,42 @@
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
var linterid = data.鍗曟嵁涓籭d;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
+ if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "宸ヨ壓鍙傛暟鐐规鍗�") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧宸ヨ壓鍙傛暟鐐规'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1261,7 +1284,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1307,23 +1330,46 @@
}
})
} else if (obj.event == '宸ュ簭鍚嶇О') {
- var linterid = data.鍗曟嵁涓籭d;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅璁惧灞ュ巻'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + ''
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
- }
+ if (data.鍗曟嵁绫诲瀷 == "宸ュ簭娴佽浆鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧灞ュ巻'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else {
+ var linterid = data.娴佽浆鍗d;
+ var HProcID = data.宸ュ簭id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧灞ュ巻'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ }
+
});
//娴�
@@ -1435,6 +1481,7 @@
}
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
+ var HProcID = data.宸ュ簭id;
layer.open({
type: 2
, area: ['100%', '100%']
@@ -1443,7 +1490,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + ''
+ , content: '../../浜轰簨绠＄悊/浜哄憳灞ュ巻/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
, resize: false,
end: function () {
}
@@ -1456,12 +1503,12 @@
//#endregion
//#region 娴佽浆鍗＄偣鍑绘煡璇� 浜烘満鏂欐硶鐜�
- function getTable_Right(linterid) {
+ function getTable_Right(linterid,SNs) {
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
type: "GET",
- data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ data: { "linterid": linterid, "SNs": SNs, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var Listcol = [];
@@ -1597,6 +1644,19 @@
, page: false
}
table.render(option_Measure);
+ if (SNs =="") {
+ //宸︿晶琛ㄦ牸
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[6]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option);
+ }
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
index 55fa17e..404b18b 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/SB_TechnologyParameterList.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/SB_TechnologyParameterList.html"
@@ -44,6 +44,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
<div class="layui-input-block">
<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HProcID" id="HProcID" value="" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -62,12 +63,14 @@
<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>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="Exit" style="padding:0 5px">閫�鍑�</button>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-row" style="margin-top:5px">
<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" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="" readonly>
</div>
</div>
<div class="layui-inline">
@@ -75,18 +78,42 @@
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
<input type="hidden" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" readonly>
+ <input type="hidden" class="layui-input" name="HEquipID" id="HEquipID" value="" 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; width: 185px;">
- <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
<option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
<option value="璁惧閲囬泦">璁惧閲囬泦</option>
</select>
</div>
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline " style="display:none">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="datetime" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="datetime" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" >
+ <div class="layui-col-xs3 layui-inline" style="margin-top:20px;">
+ <table class="layui-hide" id="mainTable_HTeach" lay-filter="mainTable_HTeach"></table>
+ </div>
+ <div class="layui-col-xs9 layui-inline" style="margin-top:20px;">
+ <div id="histogram" style="width:99.5%;height:calc(90vh);margin-top:10px;">
</div>
</div>
</div>
@@ -94,18 +121,18 @@
<div style="width:99%;height:calc(100vh);">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
- <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
- </div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="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_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display :none" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
-
+ <script type="text/html" id="toolbarDemo1">
+
+ </script>
</form>
</div>
</div>
@@ -136,8 +163,11 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+ var HProcID = params[params[2]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HMater; //鐗╂枡
+ var HProc; //宸ュ簭
+ var HEquId; //璁惧
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -165,10 +195,21 @@
break;
};
});
+
+ table.on('tool(mainTable_HTeach)', function (obj) {
+ var data = obj.data;
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '宸ヨ壓鍙傛暟') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ $("#HTechParamName").val(data.宸ヨ壓鍙傛暟);
+ get_FastQuery( );
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
});
+
// 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -199,15 +240,22 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- set_InitGrid(); //鍒濆鍖栬〃鏍�
- get_FastQuery();
- //鍔犺浇鎶樼嚎鍥�
- set_Graphics();
- if (OperationType==3) {
- Get_SB_EquipICMOTechParamBill(linterid);
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ set_InitGrid1(); //鍒濆鍖栬〃鏍�
+ if (OperationType == 3) {
+ Get_SB_EquipICMOTechParamBill(linterid, HProcID);//鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡,寮�濮嬬粨鏉熸椂闂�
+ Get_TechParam();//鑾峰彇褰撳墠娴佽浆鍗�,鐗╂枡,宸ュ簭,璁惧 瀵瑰簲鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
+ get_FastQuery();
+ //鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
+ } else {
+ get_FastQuery();
+ //鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
}
}
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
option = {
@@ -234,6 +282,69 @@
]]
};
table.render(option)
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid1() {
+ option_HTeach = {
+ elem: '#mainTable_HTeach'
+ , toolbar: '#toolbarDemo1'
+ , totalRow: true
+ , height: 'full-50'
+ , page: false
+ , cellMinWidth: 90
+ , limit: 50
+ , data: []
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', sort: true }
+ , { field: '閲囬泦鏉ユ簮', title: '閲囬泦鏉ユ簮', sort: true }
+ ]]
+ };
+ table.render(option_HTeach)
+ }
+
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗″彿
+ var HProcID = $("#HProcID").val(); //宸ュ簭鍚嶇О
+ var HTechParamName = $("#HTechParamName").val(); //宸ヨ壓鍙傛暟
+ var HEquipID = $("#HEquipID").val(); //璁惧鍚嶇О
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫椂闂�
+ var HEndDate = $("#HEndDate").val(); //缁撴潫鏃堕棿
+ if (HProcExchBillNo != "" && HProcID != "" && HTechParamName != "") {
+ sWhere = {
+ HProcExchBillNo: HProcExchBillNo
+ , HProcID: HProcID
+ , HTechParamName: HTechParamName
+ , HEquipID: HEquipID
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ }
+
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HProcExchBillNo").val("");
+ $("#HProcID").val("");
+ $("#HProcName").val("");
+ $("#HTechParamName").val("");
+ $("#HMaterID").val("");
+ $("#HMaterName").val("");
+ $("#HEquipID").val("");
+ $("#HEquipNumber").val("");
+ $("#HEquipName").val("");
+ $("#HBeginDate").val("");
+ $("#HEndDate").val("");
+
+ $("#btnSearch").click();
+ form.render('select');
+
+ sWhere = "";
}
//鏌ヨ
@@ -291,16 +402,13 @@
, cellMinWidth: 90
}
ins = table.render(option);
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
//鍔犺浇鎶樼嚎鍥�
set_Graphics();
- layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
+ layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -313,37 +421,7 @@
});
layer.close(index);
}
- //蹇�熸煡璇�
- function get_FastQuery() {
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- var HProcName = $("#HProcName").val();
- var HTechParamName = $("#HTechParamName").val();
- var HEquipName = $("#HEquipName").val();
-
- if (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") {
- sWhere = {
- HProcExchBillNo: HProcExchBillNo
- , HProcName: HProcName
- , HTechParamName: HTechParamName
- , HEquipName: HEquipName
- }
- get_Display(JSON.stringify(sWhere));
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- }
- }
- //閲嶇疆蹇�熸煡璇�
- function set_ClearQuery() {
- $("#HProcExchBillNo").val();
- $("#HProcName").val();
- $("#HTechParamName").val();
- $("#HMaterName").val();
- $("#HEquipName").val();
- $("#btnSearch").click();
- form.render('select');
-
- sWhere = "";
- }
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
@@ -419,7 +497,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -433,7 +511,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -455,7 +533,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -477,7 +555,7 @@
type: 'line',
label: {
show: true,
- formatter: '{c}%'
+ formatter: '{c}'
},
tooltip: {
valueFormatter: function (value) {
@@ -546,10 +624,10 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMaterID").val(checkStatus.data[0].HMaterID);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
- $("#HProcName").val(checkStatus.data[0].褰撳墠宸ュ簭);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- get_EquipList();
+ //$("#HProcName").val(checkStatus.data[0].褰撳墠宸ュ簭);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -576,8 +654,8 @@
area: ['90%', '90%'],
maxmin: true,
content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -585,8 +663,11 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+ $("#HProcID").val(checkStatus.data[0].HItemID);
$("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_EquipList();//鏌ユ壘璁惧 鍜� 娴佽浆鍗＄殑 寮�瀹屽伐鏃堕棿
+ Get_TechParam();//鏌ユ壘杩欎釜娴佽浆鍗� 宸ュ簭鐨勪骇鍝佸伐鑹哄弬鏁版竻鍗�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -610,7 +691,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '宸ュ簭鍒楄〃',
+ title: '宸ヨ壓鍙傛暟鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['90%', '90%'],
@@ -641,20 +722,32 @@
});
});
- //鏍规嵁娴佽浆鍗¤幏鍙栬澶囩偣妫�琛ㄧ殑 璁惧
- function get_EquipList() {
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 3) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+ });
+ //鏍规嵁娴佽浆鍗�+宸ュ簭 鑾峰彇 璁惧
+ function get_EquipList() {
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HProcID = $("#HProcID").val();
$.ajax({
url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipList",
type: "GET",
async: false,
- data: { "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"] },
+ data: { "HProcExchBillNo": HProcExchBillNo, "HProcID": HProcID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
var data = result.data;
- $("#HEquipName").val(data[0]["HName"]);
- $("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
+ $("#HEquipID").val(data[0]["璁惧id"]);
+ $("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
+ $("#HEquipNumber").val(data[0]["璁惧浠ｇ爜"]);
+ $("#HBeginDate").val(Pub_Format(data[0]["寮�濮嬫椂闂�"],"yyyy-MM-dd hh:mm:ss"));
+ $("#HEndDate").val(Pub_Format(data[0]["缁撴潫鏃堕棿"], "yyyy-MM-dd hh:mm:ss"));
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -666,22 +759,25 @@
}
//鏍规嵁鍏ㄧ▼杩芥函鎶ヨ〃鑾峰彇娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡
- function Get_SB_EquipICMOTechParamBill(linterid) {
-
+ function Get_SB_EquipICMOTechParamBill(linterid, HProcID) {
$.ajax({
url: GetWEBURL() + "/QC_CustomerAppealReport/Get_EquipICMOTechParamList",
type: "GET",
async: false,
- data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ data: { "linterid": linterid, "HProcID": HProcID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
var data = result.data;
- $("#HProcExchBillNo").val(data[0]["HProcExchBillNo"]);
+ $("#HProcExchBillNo").val(data[0]["宸ュ簭娴佽浆鍗″彿"]);
+ $("#HProcID").val(data[0]["宸ュ簭id"]);
$("#HProcName").val(data[0]["宸ュ簭鍚嶇О"]);
+ $("#HMaterID").val(data[0]["鐗╂枡id"]);
$("#HMaterName").val(data[0]["鐗╂枡鍚嶇О"]);
+ $("#HEquipID").val(data[0]["璁惧id"]);
+ $("#HEquipNumber").val(data[0]["璁惧浠ｇ爜"]);
$("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
- $("#HEquipName").val(data[0]["璁惧鍚嶇О"]);
-
+ $("#HBeginDate").val(Pub_Format(data[0]["寮�濮嬫椂闂�"], "yyyy-MM-dd hh:mm:ss"));
+ $("#HEndDate").val(Pub_Format(data[0]["缁撴潫鏃堕棿"], "yyyy-MM-dd hh:mm:ss"));
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
@@ -691,6 +787,72 @@
}
})
}
+
+ //鏍规嵁娴佽浆鍗�,宸ュ簭,璁惧,鐗╂枡 鑾峰彇浜у搧宸ヨ壓鍙傛暟娓呭崟鐨� 宸ヨ壓鍙傛暟
+ function Get_TechParam() {
+ HMater = $("#HMaterID").val();
+ HProc = $("#HProcID").val();
+ HEquId = $("#HEquipID").val();
+ $.ajax({
+ url: GetWEBURL() + "/QC_CustomerAppealReport/Get_TechParamList",
+ type: "GET",
+ async: false,
+ data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId,"user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ 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) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_HTeach = {
+ elem: '#mainTable_HTeach'
+ , toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: result.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ table.render(option_HTeach);
+ } else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ })
+ }
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
@@ -704,7 +866,6 @@
return vars;
}
//#endregion
-
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBindingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBindingList.html"
index a141bef..3f9bd27 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBindingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\205\263\351\224\256\344\273\266\347\273\221\345\256\232/Sc_KeyElementBindingList.html"
@@ -148,7 +148,7 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <table class="layui-hide" 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="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -225,8 +225,45 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 澶村伐鍏锋爮浜嬩欢
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var HPartsOld = data.閰嶄欢鏉＄爜;
+ if (obj.event === '閰嶄欢鏉＄爜') {
+ layer.prompt({
+ formType: 2
+ , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+ , title: '鏇挎崲閿�鍞鍗曞彿涓� 銆� ' + data.閿�鍞鍗曞彿 + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.浜у搧浠ｇ爜 + ' 銆� 鐨勯厤浠剁爜缁戝畾'
+ , value: '' //鏂囨湰妗嗛粯璁ゆ樉绀哄唴瀹�
+ }, function (value, index) {
+ layer.close(index);
+ //鏇存柊閰嶄欢鏉＄爜
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_KeyElementBinding/UpdatePartsCode",
+ async: false,
+ data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HPartsCode": value, "HPartsOld": HPartsOld, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 閰嶄欢鏉＄爜: value
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ },
+ error: function (result) {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ });
+ });
+ }
+ });
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
@@ -268,7 +305,7 @@
//瀵煎嚭excel
case 'get_export':
get_Export();
- break;
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
@@ -317,7 +354,7 @@
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = true;
}
- });
+ });
});
//#endregion
@@ -367,13 +404,7 @@
}
//#endregion
//#endregion
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
-
-
- });
- //#endregion
+
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -402,6 +433,9 @@
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: '閰嶄欢鏉＄爜' });
}
else {
switch (data[i].Type) {
@@ -609,7 +643,7 @@
table.exportFile(ins.config.id, option.data, "xls");
}
- //#endregion
+ //#endregion
//#region 鍒犻櫎
function set_DeleteBill() {
@@ -817,7 +851,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 53e2225..7b0c87c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -869,7 +869,6 @@
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
get_DisplaySub(obj.data);
-
});
//#endregion
@@ -2695,7 +2694,7 @@
}
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, "3797", HModName, sessionStorage["HUserName"]);
+ Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
index 3eb5502..f0959f6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
@@ -70,7 +70,7 @@
<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>
- <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="btnReSearch" style="padding:0 5px">閫�鍑�</button>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="Exit" style="padding:0 5px">閫�鍑�</button>
</div>
</div>
</div>
@@ -373,6 +373,17 @@
if (data1.count == 1) {
$("#HEquipNumber").val(data1.data[0].璁惧缂栫爜);
$("#HEquipName").val(data1.data[0].璁惧鍚嶇О);
+ // 鑾峰彇椤圭洰缂栧彿鐨勫悗涓変綅
+ var lastThreeChars = data1.data[0].椤圭洰缂栧彿.substring(data1.data[0].椤圭洰缂栧彿.length - 3);
+ // 灏嗗�艰缃埌杈撳叆妗�
+ $("#HProcExchBillNo").val(lastThreeChars);
+ if (data1.data[0].缁撴潫鏃堕棿 <= data1.data[0].寮�濮嬫椂闂�) {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(new Date()));
+ } else {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(data1.data[0].缁撴潫鏃堕棿));
+ }
} else {
layer.alert(data1.Message, { icon: 5 });
}
@@ -384,7 +395,12 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- Pub_Close(1);
+ if (OperationType == 1) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+
});
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
index 9591023..9b4c83e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_TemperatureCurveDryingMachine.html"
@@ -73,7 +73,7 @@
<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>
- <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="btnReSearch" style="padding:0 5px">閫�鍑�</button>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="Exit" style="padding:0 5px">閫�鍑�</button>
</div>
</div>
</div>
@@ -143,12 +143,7 @@
layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
return false;
}
- if (OperationType == 1) {
- get_HProcHBillNoId(linterid);
- get_FastQuery();
- } else {
- get_FastQuery();
- }
+ get_FastQuery();
});
@@ -160,7 +155,12 @@
function set_ClearBill() {
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- get_FastQuery();
+ if (OperationType == 1) {
+ get_HProcHBillNoId(linterid);
+ get_FastQuery();
+ } else {
+ get_FastQuery();
+ }
}
//鏌ヨ鏁版嵁
@@ -386,6 +386,14 @@
if (data1.count == 1) {
$("#HEquipNumber").val(data1.data[0].璁惧缂栫爜);
$("#HEquipName").val(data1.data[0].璁惧鍚嶇О);
+ if (data1.data[0].缁撴潫鏃堕棿 <= data1.data[0].寮�濮嬫椂闂�) {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(new Date()));
+ } else {
+ $("#HBeginDate").val(formatDate(data1.data[0].寮�濮嬫椂闂�));
+ $("#HEndDate").val(formatDate(data1.data[0].缁撴潫鏃堕棿));
+ }
+ layer.close(wait);
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -399,8 +407,12 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- Pub_Close(1);
- //window.parent.location.reload();
+ if (OperationType == 1) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+
});
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
index 98b957f..ba7d52e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
@@ -133,7 +133,7 @@
item[itemobj] = "";
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
- item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','锛�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
}
});
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index d1f0a73..7d1c6c2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -26,13 +26,15 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</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">
<h1 style="text-align: center; padding: 10px 0;"><b>浠樻鍗�</b></h1>
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍏跺畠淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -74,56 +76,12 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
<div class="layui-inline" style="width:900px;">
<label class="layui-form-label">涓氬姟鍗曚綅<label style="color:red"> * </label></label>
<div class="layui-input-inline" style="width:750px;">
<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 475px; background-color: #efefef4d;" readonly>
<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡</label>
- <div class="layui-input-inline">
- <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撶畻鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSSNum" id="HSSNum" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:900px;">
- <label class="layui-form-label">缁撶畻鍗曚綅<label style="color:red"> * </label></label>
- <div class="layui-input-inline" style="width:750px;">
- <input type="text" name="HAccSupName" id="HAccSupName" class="layui-input" value="" style="float: left; width: 475px; background-color: #efefef4d;" readonly>
- <input type="hidden" name="HAccSupID" id="HAccSupID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HAccSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -144,12 +102,6 @@
<label class="layui-form-label">閾惰璐﹀彿</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBankNo" id="HBankNo" style="background-color: #efefef4d;" autocomplete="off" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍐呴儴璁㈠崟鍙�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color: #efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -182,12 +134,6 @@
<label class="layui-form-label">鎶樻墸鍚庨噾棰�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HRelSumMoney" value="0" id="HRelSumMoney" autocomplete="off" style="background-color: #efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">璐㈠姟鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" lay-verify="HAccDate" name="HAccDate" id="HAccDate" style="padding-left: 80px;">
</div>
</div>
</div>
@@ -233,6 +179,70 @@
</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">甯佸埆<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴璁㈠崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撶畻鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSSNum" id="HSSNum" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:900px;">
+ <label class="layui-form-label">缁撶畻鍗曚綅<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width:750px;">
+ <input type="text" name="HAccSupName" id="HAccSupName" class="layui-input" value="" style="float: left; width: 475px; background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HAccSupID" id="HAccSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HAccSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐㈠姟鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" lay-verify="HAccDate" name="HAccDate" id="HAccDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
<!--鍒跺崟淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -579,6 +589,12 @@
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
+ });
+ //#endregion
+
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
});
//#endregion
@@ -1103,6 +1119,152 @@
}
//#endregion
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+
+ url = "../../閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBillQuery.html?openType=2&HOrgID=" + HOrgID;
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_PayableBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": 0
+ , "HMainSourceEntryID": 0
+ , "HMainSourceBillNo": ''
+ , "HMainSourceBillType": '1114'
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].绋庣巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ /*, "HSSNum": checkStatus[0].缁撶畻鍙�*/
+ , "HAccSupID": dataArray[0].HSupID
+ , "HAccSupName": dataArray[0].渚涘簲鍟�
+ , "HSumMoney": dataArray[0].閲戦
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3) //
+ , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HInvoiceBillNo_Sub": dataArray[i].鍙戠エ缂栧彿 ? "" : dataArray[i].鍙戠エ缂栧彿
+ , "HReceiveBillInterID": dataArray[i].hmainid
+ , "HReceiveBillEntryID": dataArray[i].hsubid
+ , "HReceiveBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceDate": Format(dataArray[i].鏃ユ湡, "yyyy-MM-dd")
+ , "HSourceMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+ , "HSourceMoneyBB": dealDoubleToFixed(dataArray[i].閲戦 * dataArray[0].姹囩巼, 2)
+ , "HInovceExRate": dataArray[i].姹囩巼
+
+ , "HSourceRemark": dataArray[i].琛ㄤ綋澶囨敞
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": '1114'
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': dataArray[i].HPOOrderInterID
+ , 'HPOOrderEntryID': dataArray[i].HPOOrderEntryID
+ , 'HPOOrderBillNo': dataArray[i].HPOOrderBillNo
+
+ , "HSeOrderInterID": dataArray[i].HSeOrderInterID
+ , "HSeOrderEntryID": dataArray[i].HSeOrderEntryID
+ , "HSeOrderBillNo": dataArray[i].HSeOrderBillNo
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ }
+ //#endregion
+
+
//#region 缁撶畻鏂瑰紡閫夋嫨椤甸潰
function get_checkSS() {
layer.open({
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
index 71fa914..f073f0a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBillList.html"
@@ -151,6 +151,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -199,7 +200,9 @@
var option = [];
var sWhere = "";
var HModName = "YF_PayMentBillList";
- var HBillType = "2103"
+ var HBillType = "2103";
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -366,12 +369,21 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(2);
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//#endregion
@@ -431,12 +443,34 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion
//#endregion
@@ -553,6 +587,84 @@
}
//#endregion
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/YF_PayMentBill/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.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: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -639,7 +751,7 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index ec92e1a..8942b59 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -47,6 +47,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="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -498,6 +499,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
@@ -615,6 +622,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1102") {
@@ -709,7 +717,7 @@
}
);
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -810,7 +818,7 @@
}
);
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -1303,6 +1311,316 @@
})
}
//#endregion
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1102") {
+ url = "../../閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#BillType").val() == "1201") {
+ url = "../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1102") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ option.data = [];//娓呯┖瀛愯〃
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ , "HPSStyleID": dataArray[0].HPSStyleID
+ , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ });
+
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': HTaxMoney //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;//鏁伴噺
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1201") {
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HSupID": dataArray[0].HSupID
+ , "HSupName": dataArray[0].渚涘簲鍟�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": "0"
+ , "HSSName": ""
+ , "HPSStyleID": dataArray[0].HPSStyleID
+ , "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ });
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].瀹炴敹鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': HTaxMoney //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].鍗曟嵁绫诲瀷
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ // , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
@@ -2096,7 +2414,7 @@
$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
}
var sMainStr = JSON.stringify(data.field);
-
+ debugger
//鑾峰彇瀛愯〃鏁版嵁
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -2948,7 +3266,7 @@
}
);
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -3082,7 +3400,7 @@
}
);
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 069bae2..1248439 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -154,6 +154,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm " lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b" id="set_AddNew"></i>鏂板</button>
@@ -205,7 +206,8 @@
var option = [];
var sWhere = "";
var HModName = "Cg_PayableBillList";
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1114";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -365,12 +367,21 @@
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(2);
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery(2);
+ }
});
//#endregion
@@ -431,12 +442,34 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, totalRow: true
//, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 50000]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion
//#endregion
@@ -534,6 +567,83 @@
}
//#endregion
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_PayableBill/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.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: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -626,7 +736,7 @@
sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -704,7 +814,7 @@
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
- if (data[0].鐘舵�� == "鍒涘缓") {
+ if (data[0].鍗曟嵁鐘舵�� == "鍒涘缓") {
$.ajax({
url: GetWEBURL() + '/Cg_PayableBill/delete',
type: "GET",
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
index b9fb0c8..b1f41a9 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
@@ -202,7 +202,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -439,7 +439,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -465,8 +465,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -484,6 +484,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_PayableBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -502,7 +503,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1414,13 +1415,26 @@
//#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;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1723,7 +1737,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index 5279c6a..193684b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -200,6 +200,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></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="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -258,7 +259,8 @@
var sWhere = "";
var option = [];
var HModName = "Cg_POInStockBillList";
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1103";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -292,12 +294,21 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery(table, option, 2);
+ }
});
//#endregion
@@ -391,7 +402,7 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, totalRow: true
- , page: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -469,6 +480,28 @@
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
@@ -548,6 +581,88 @@
}
});
}
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POInStockBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.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: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1103";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -1244,7 +1359,7 @@
}
//sWhere += " and 鍏抽棴浜� =''";
sWhere += addSWhereByOpenType();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -1360,7 +1475,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
index be07278..116578f 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillQuery.html"
@@ -216,7 +216,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -460,7 +460,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -486,8 +486,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -505,6 +505,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -523,7 +524,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1488,14 +1489,24 @@
//#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;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
-
})
//瀛愯〃鍗曢��
@@ -1797,7 +1808,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
new file mode 100644
index 0000000..e0b1246
--- /dev/null
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderInStockSumReport.html"
@@ -0,0 +1,553 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>閲囪喘鍏ュ簱姹囨�绘槑缁嗘姤琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <select name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
+ <!--鍔ㄦ�佹覆鏌�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ </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-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="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>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Cg_POOrderInStockSumReport";
+ var ins;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ //瀵煎嚭excel
+ case '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().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+ get_btnHMaterID();
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鑾峰彇閿�鍞鍗曞彿
+ HOrderBillNo()
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+
+ //ColFilter();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 'full-70'
+ };
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ DisPlay_HideColumn();
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
+ var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
+ var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
+ var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
+ var check = "";
+ if (chkHShowUnFinish) {
+ check = "Y";
+ }
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ 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;
+ }
+ sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#txtHOrderProcNo").val("");
+ $("#txtHMaterNumber").val("");
+ $("#txtHDeptName").val("");
+ $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
+ $("#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 = " ";
+ get_FastQuery();
+ }
+ //閿�鍞鍗曚笅鎷夋
+ function HOrderBillNo() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var HOrderBillNo = '<option style="color:blue;" value=""></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
+ async: false,
+ data: { "sWhere": "", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HOrderBillNo += '<option style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
+ }
+
+ $("#txtHOrderProcNo").append(HOrderBillNo);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', 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
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index bf4197b..2feca0e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -108,18 +108,18 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-block" style="width:190px;">
- <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
- <option value="">鍏ㄩ儴</option>
- <option value="鏉庣編闇�">鏉庣編闇�</option>
- <option value="寰愬阀涔�">寰愬阀涔�</option>
- <option value="鏃舵枃浠�">鏃舵枃浠�</option>
- <option value="姹熸闃�">姹熸闃�</option>
- <option value="鏄撴柊绾�">鏄撴柊绾�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏉庣編闇�">鏉庣編闇�</option>
+ <option value="寰愬阀涔�">寰愬阀涔�</option>
+ <option value="鏃舵枃浠�">鏃舵枃浠�</option>
+ <option value="姹熸闃�">姹熸闃�</option>
+ <option value="鏄撴柊绾�">鏄撴柊绾�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗忓悓鐘舵��</label>
<div class="layui-input-block">
@@ -131,11 +131,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
- </div>
- </div>-->
+ <label class="layui-form-label">鍙嶉鐘舵��</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -276,6 +276,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></div>
<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="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -347,7 +348,8 @@
var Name = "MouldProdInHouseCellWidth";
var HModName = "Cg_POOrderBillList";
var HBillType = "1102";
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1102";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -503,6 +505,11 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
table.on('tool(mainTable)' , function (obj) {
@@ -576,7 +583,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery(table, option, 2);
+ }
});
//琛ㄥご淇℃伅閮ㄩ棬寮圭獥
@@ -855,11 +866,11 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
- , page: true
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 20000]
+ //, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
@@ -961,6 +972,28 @@
soulTable.render(this);
}
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
////璁剧疆鍒楀
//var colWidth = getColumnsWidth();
//if (colWidth == "" || colWidth == []) {
@@ -1064,6 +1097,86 @@
}
});
}
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/page',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.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: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "1102";
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//鏂板
function set_AddNew() {
@@ -2302,7 +2415,7 @@
//娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
//sWhere += " and HUserID =" + sessionStorage["Czybm"]
var index = layer.load(0);
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
@@ -2335,7 +2448,6 @@
$("select[name='HFeedback']").val("");
form.render('select');
sWhere = "";
- get_Display(sWhere);
}
//閲嶆柊鍚屾鎸夐挳
function set_ResCnz() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
index 100c10f..76e1570 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillQuery.html"
@@ -23,6 +23,7 @@
background: #ceedfa;
color: black
}
+
</style>
</head>
@@ -210,7 +211,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -453,7 +454,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
////鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- //get_FastQuery(table, option,1)
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -463,7 +464,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-330'
+ , height: 'full-300'
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -479,8 +480,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -498,6 +499,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -516,7 +518,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1480,15 +1482,26 @@
//#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;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
-
-
+
})
//瀛愯〃鍗曢��
table.on('row(mainTableSub)', function (obj) {
@@ -1789,7 +1802,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index dc338c7..e24624c 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -48,6 +48,7 @@
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius " lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -423,7 +424,25 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1402' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HMakeDate").val(shijian);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+ }
//#endregion
@@ -493,6 +512,12 @@
//#region 瀹℃牳鎸夐挳
form.on('submit(set_CheckBill)', function (data) {
set_CheckBill(0);
+ });
+ //#endregion
+
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
});
//#endregion
@@ -581,6 +606,7 @@
var ajaxLoad = layer.load();
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
$.ajax({
@@ -862,12 +888,139 @@
//#endregion
+
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- //#region鎵撳嵃
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html";
+ if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
+ return layer.msg('璇烽�夋嫨鍗曟嵁绫诲瀷');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + getSupType().name + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#HSourceBillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectID").val(checkStatus.data[0].HProjectID ? checkStatus.data[0].HProjectID : 0);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰缂栫爜);
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+
+ $("#HCusID").val(checkStatus.data[0].HCusID);
+ $("#HCusName").val(checkStatus.data[0].瀹㈡埛);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HWHID").val(checkStatus.data[0].涓讳粨搴搃d);
+ $("#HWHName").val(checkStatus.data[0].涓讳粨搴�);
+
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var HQty = checkStatus.data[i].鏁伴噺 - checkStatus.data[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = checkStatus.data[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ option.data.push({
+ "HMaterID": checkStatus.data[i].HMaterID
+ , "鐗╂枡浠ｇ爜": checkStatus.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": checkStatus.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": checkStatus.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": checkStatus.data[i].HUnitID
+ , "璁￠噺鍗曚綅": checkStatus.data[i].璁￠噺鍗曚綅
+ , "HWHID": checkStatus.data[i].HWhID
+ , "鍙戣揣浠撳簱": checkStatus.data[i].瀛愪粨搴�
+ , "HQty": HQty,
+ "HPrice": checkStatus.data[i].鍗曚环,
+ "HMoney": HMoney
+ , "HRemark": ""
+ , "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�
+ , "HSourceBillType": checkStatus.data[i].HBillType
+ , "HSourceInterID": checkStatus.data[i].hmainid
+ , "HSourceEntryID": checkStatus.data[i].hsubid
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
+ //#region 鎵撳嵃
function get_PrintReport(data) {
var hmainid = data.field["HInterID"];
console.log(hmainid);
@@ -1022,51 +1175,6 @@
});
}
//#endregion
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '1402' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HMakeDate").val(shijian);
- $("#HMaker").val(sessionStorage["HUserName"]);
- }
- });
- //椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
- get_DeptHManage();
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- $("#HInterID").val(linterid);
- RoadBillMain(linterid);
- /* RoadBillSub(linterid);*/
- }
-
-
- //閫�鍑�
- form.on('submit(Exit)', function (data) {
- if (linterid == undefined) {
- //鍏抽棴椤电
- Pub_Close(2);
- }
- else {
- //鍏抽棴椤电
- Pub_Close(1);
- }
- });
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 93e3c65..5e28412 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -1024,7 +1024,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
index 0654a02..ff47c60 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillQuery.html"
@@ -216,7 +216,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -456,7 +456,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /* get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -482,8 +482,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -501,6 +501,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOutStockBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -519,7 +520,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1487,13 +1488,26 @@
//#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;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1796,7 +1810,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
index e3be052..4efd2be 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBill.html"
@@ -47,6 +47,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="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -484,6 +485,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
@@ -601,6 +608,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1401") {
@@ -641,7 +649,7 @@
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃鎴愭湰浠稥ntry 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
@@ -746,7 +754,7 @@
);
}
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -778,25 +786,25 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
- , "HCusID": dataArray[0].hsupid
+ , "HCusID": dataArray[0].HSupID
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
- var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
rowdataEntry.push(
{
@@ -884,7 +892,7 @@
}
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -1691,6 +1699,406 @@
})
}
//#endregion
+
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1401") {
+ url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ HSourceBillName = "閿�鍞鍗�";
+ }
+ else if ($("#BillType").val() == "1205") {
+ url = "../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ HSourceBillName = "閿�鍞嚭搴撳崟";
+ }
+ else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HCusID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCusID": dataArray[0].HCusID
+ , "HCusName": dataArray[0].瀹㈡埛
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HSSID": dataArray[0].HSSID
+ , "HSSName": dataArray[0].缁撶畻鏂瑰紡
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ });
+
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
+ //瀛愯〃鎴愭湰浠稥ntry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].HNoTaxCost; //鎴愭湰浠�
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ } else {
+ //瀛愯〃Entry 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
+ var HExRate = $("#HExRate").val(); //姹囩巼
+ var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //鏈綅甯佷环绋庡悎璁�=(绋庨+閲戦)*姹囩巼
+ var HMoneyBB = HMoney * HExRate;
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
+ , 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ }
+ );
+ }
+ }
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1205") {
+ $.ajax({
+ url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+
+ , "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HMangerID": dataArray[0].HManagerID
+ , "HMangerName": dataArray[0].涓荤
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HCusID": dataArray[0].HSupID
+ , "HCusName": dataArray[0].瀹㈡埛
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
+ , "HSSID": "0"
+ , "HSSName": ""
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ });
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 * 1 - dataArray[i].宸插叧鑱旀暟閲� * 1; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鎴愭湰鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鎴愭湰鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ }
+ else {
+ //瀛愯〃 璧嬪��
+ var rowdataEntry = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ rowdataEntry.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].hunitid
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , 'HDiscountRate': "1" //
+ , 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , 'HTaxMoney': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].绋庣巼, 2) //
+ , "HMoney": dealDoubleToFixed(HQty * dataArray[i].鍗曚环, 2)
+ , 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].鍗曚环 * dataArray[0].姹囩巼, 2)
+ , 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环, 2)
+ , 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].鍚◣鍗曚环 * dataArray[0].姹囩巼, 2)
+ , "HRemark": ""
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
+ , "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
+ , "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].婧愬崟鍗曞彿 : ""
+ }
+ );
+ }
+ }
+
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
+ table.render(optionEntry);
+ //瀛愯〃姹囨��
+ for (var i = 0; i < rowdataEntry.length; i++) {
+ var item = rowdataEntry[i];
+ for (var j = i + 1; j < rowdataEntry.length; j++) {
+ if (rowdataEntry[j].HMaterID == item.HMaterID) {
+ rowdataEntry[i].HQty += rowdataEntry[j].HQty;
+ rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//閲戦=鏁伴噺*鍗曚环
+ rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//绋庨
+ rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //浠风◣鍚堣
+ var HExRate = $("#HExRate").val();
+ rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //鏈綅甯佷环绋庡悎璁�
+ rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //鏈綅甯侀噾棰�
+ rowdataEntry.splice(j, 1);
+ j = j - 1;
+ }
+ }
+ }
+ set_InitGridHaveSource();
+ option.data = rowdataEntry;
+ haveSource = true;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
@@ -3112,7 +3520,7 @@
);
}
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -3185,15 +3593,15 @@
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HCusID": dataArray[0].hsupid
, "HCusName": dataArray[0].瀹㈡埛
- , "HCurID": dataArray[0].HCurID
- , "HCurName": dataArray[0].甯佸埆
- , "HExRate": dataArray[0].姹囩巼
+ , "HCurID": dataArray[0].涓昏〃甯佸埆id
+ , "HCurName": dataArray[0].涓昏〃甯佸埆
+ , "HExRate": dataArray[0].涓昏〃姹囩巼
, "HSSID": "0"
, "HSSName": ""
, "HSellSID": dataArray[0].HSellSID
, "HSellSName": dataArray[0].閿�鍞柟寮�
});
- if ($("#HPriceType").val() == "鎴愭湰浠�") {
+ if ($("#HPriceType").val() == "鍘荤◣浠�") {
//瀛愯〃 璧嬪��
var rowdataEntry = [];
for (var i = 0; i < dataArray.length; i++) {
@@ -3282,7 +3690,7 @@
}
}
- optionEntry.data = rowdataEntry;
+ optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
table.render(optionEntry);
//瀛愯〃姹囨��
for (var i = 0; i < rowdataEntry.length; i++) {
@@ -3365,7 +3773,7 @@
function getDecByMaterID(HMaterID) {
var resultData = {};
$.ajax({ // 寮傛璇锋眰
- url: GetWEBURL() + "Gy_Material/getDecByID", //璇锋眰鍦板潃
+ url: GetWEBURL() + "/Gy_Material/getDecByID", //璇锋眰鍦板潃
async: false, //鏄惁寮�鍚紓姝�
type: "GET", //璇锋眰绫诲瀷
data: { //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
index 032e904..6f50f2d 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\272\224\346\224\266\345\215\225/Xs_ReceivableBillQuery.html"
@@ -189,7 +189,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:30px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -426,7 +426,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -452,8 +452,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -471,6 +471,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_ReceivableBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -489,7 +490,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1415,14 +1416,24 @@
//#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;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
-
})
//瀛愯〃鍗曢��
@@ -1724,7 +1735,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
new file mode 100644
index 0000000..fa4044c
--- /dev/null
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\346\212\245\350\241\250/Xs_SeOrderOutStockSumReport.html"
@@ -0,0 +1,553 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍑哄簱姹囨�绘槑缁�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <select name="txtHOrderProcNo" id="txtHOrderProcNo" lay-filter="txtHOrderProcNo" style="width:190px;"lay-search>
+ <!--鍔ㄦ�佹覆鏌�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ </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-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="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>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Xs_SeOrderOutStockSumReport";
+ var ins;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ //瀵煎嚭excel
+ case '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().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+ get_btnHMaterID();
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鑾峰彇閿�鍞鍗曞彿
+ HOrderBillNo()
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+
+ //ColFilter();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 'full-70'
+ };
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+ DisPlay_HideColumn();
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
+ var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
+ var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
+ var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
+ var check = "";
+ if (chkHShowUnFinish) {
+ check = "Y";
+ }
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ 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;
+ }
+ sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#txtHOrderProcNo").val("");
+ $("#txtHMaterNumber").val("");
+ $("#txtHDeptName").val("");
+ $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
+ $("#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 = " ";
+ get_FastQuery();
+ }
+ //閿�鍞鍗曚笅鎷夋
+ function HOrderBillNo() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var HOrderBillNo = '<option style="color:blue;" value=""></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
+ async: false,
+ data: { "sWhere": "", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HOrderBillNo += '<option style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
+ }
+
+ $("#txtHOrderProcNo").append(HOrderBillNo);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTablemainTable)', 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
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
index 3177b03..9ed6c49 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillQuery.html"
@@ -210,7 +210,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -453,7 +453,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -479,8 +479,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -498,6 +498,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOrderBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -516,7 +517,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1483,13 +1484,26 @@
//#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;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1792,7 +1806,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 鐘舵�� = '宸插鏍�' ";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
index 4e63094..1c7e8e5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill.html"
@@ -48,6 +48,7 @@
<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="set_CheckBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
<button type="button" id="btn-print" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn-print">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -674,6 +675,12 @@
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
+
//#region 鎵撳嵃鎸夐挳
form.on('submit(btn-print)', function (data) {
get_PrintReport();
@@ -833,6 +840,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#BillType").val() == "1401") {
@@ -1994,6 +2002,314 @@
})
}
//#endregion
+
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#BillType").val() == "1401") {
+ url = "../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#BillType").val() == "1402") {
+ url = "../../閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佹敼婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + '婧愬崟' + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HCusID = $("#HSupID").val();//鍒ゆ柇瀹㈡埛
+ if (HCusID == 0 || HCusID == '') {
+ HCusID = checkStatus.data[0]["HCusID"];
+ }
+ //鑾峰彇璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HCusID"] != HCusID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#BillType").val() == "1401") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
+ , "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /*, "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+ , "HSupID": dataArray[0].HCusID
+ , "HSupName": dataArray[0].瀹㈡埛
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
+ , "HSellSID": dataArray[0].HSellSID
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰缂栫爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].鍏宠仈鏁伴噺; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ var HTaxRate = dataArray[i].绋庣巼 * 0.01; //绋庣巼
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPieceQty": "0"
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
+ , "HTaxRate": dataArray[i].绋庣巼 == "" ? 0 : dataArray[i].绋庣巼
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , "HTaxMoney": dealDoubleToFixed(HTaxMoney, 2)
+ , "HWHID": dataArray[i].HWhID
+ , "鍙戣揣浠撳簱": dataArray[i].瀛愪粨搴�
+ , "HRemark": ""
+
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+
+
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#BillType").val() == "1402") {
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOutStockBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dataArray = data1.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HDeptID": dataArray[0].HDeptID
+ , "HDeptName": dataArray[0].閮ㄩ棬
+ , "HEmpID": dataArray[0].HEmpID
+ , "HEmpName": dataArray[0].涓氬姟鍛�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
+ , "HMainSourceInterID": "0"
+ , "HMainSourceEntryID": "0"
+ /* , "HMainSourceBillNo": ""*/
+ , "HMainSourceBillType": $("#BillType").val()
+ , "HSupID": dataArray[0].HCusID
+ , "HSupName": dataArray[0].瀹㈡埛
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴鐢佃瘽
+ , "HSellSID": "0"
+ , "HSellSName": dataArray[0].閿�鍞柟寮�
+ , "HCurID": dataArray[0].HCurID
+ , "HCurName": dataArray[0].甯佸埆
+ , "HExRate": dataArray[0].姹囩巼
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰缂栫爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HLinkMan": dataArray[0].鑱旂郴浜�
+ , "HLinkPhone": dataArray[0].鑱旂郴浜虹數璇�
+ });
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < dataArray.length; i++) {
+ var HQty = dataArray[i].鏁伴噺 - dataArray[i].宸插叧鑱旀暟閲�; //鏁伴噺
+ var HPrice = dataArray[i].鍗曚环; //鍗曚环
+ var HMoney = HQty * HPrice; //閲戦=鏁伴噺*鍗曚环
+ rowdata.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(HQty, 1)
+ , "HPieceQty": "0"
+ , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+ , "HTaxPrice": "0"
+ , "HTaxRate": "0"
+ , "HMoney": dealDoubleToFixed(HMoney, 2)
+ , "HTaxMoney": "0"
+ , "HWHID": dataArray[i].HWHID
+ , "鍙戣揣浠撳簱": dataArray[i].鍙戣揣浠撳簱
+ , "HRemark": ""
+
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+
+
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ }
+ );
+ }
+ option.data = rowdata;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//#endregion
//#region 瀛愯〃鍒濆鍖�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
index 82c980d..aeec93e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillQuery.html"
@@ -203,7 +203,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -438,7 +438,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -464,8 +464,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -483,6 +483,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_SellOutBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -501,7 +502,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1438,13 +1439,26 @@
//#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;
+ }
+ });
+
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1747,7 +1761,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 0658ad3..14fd16d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -51,6 +51,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">閫夋暣鍗�</button>
<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -537,6 +538,11 @@
get_PrintReport();
});
//#endregion
+ //#region 閫夋暣鍗�
+ form.on('submit(set_SelectMainBill)', function (data) {
+ set_SelectMainBill();
+ });
+ //#endregion
//閫夋嫨涓氬姟鍛樻寜閽�
form.on('submit(HEmpList)', function () {
get_checkEmp();
@@ -603,6 +609,7 @@
var url;
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
if (HSourceBillNo == "") {
+ layer.close(ajaxLoad);
return;
}
if ($("#HSourceBillType").val() == "1102") {
@@ -2442,6 +2449,177 @@
}
}
+ //#region 閫夋暣鍗�
+ function set_SelectMainBill() {
+ var url;
+ if ($("#HSourceBillType").val() == "1102") {
+ url = "../../閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else if ($("#HSourceBillType").val() == "1103") {
+ url = "../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillQuery.html?openType=2&HOrgID=" + HOrgID;
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: '' + getSupType().name + '鍒楄〃' //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [url, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length == 0) {
+ return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+ }
+ var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+ if (HSupID == 0 || HSupID == '') {
+ HSupID = checkStatus.data[0]["HSupID"];
+ }
+ //鑾峰彇渚涘簲鍟嗕唬鐮�,璁剧疆鏉′欢
+ var sMainWhere = " and hmainid in(";
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (checkStatus.data[i]["HSupID"] != HSupID) {
+ layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+ sMainWhere += checkStatus.data[i]["hmainid"]
+ if (i != checkStatus.data.length - 1) {
+ sMainWhere += ",";
+ } else {
+ sMainWhere += ") ";
+ }
+ }
+ getSeletMainInfo(sMainWhere);
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鏁村崟淇℃伅鑾峰彇鏂规硶
+ function getSeletMainInfo(sMainWhere) {
+ var ajaxLoad = layer.load();
+ if ($("#HSourceBillType").val() == "1102") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/list',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ for (var j = 0; j < checkStatus.data.length; j++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HQtyMust": checkStatus.data[j].鏁伴噺,
+ "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+
+ } else if ($("#HSourceBillType").val() == "1103") {
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POInStockBill/list',
+ type: "GET",
+ data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ checkStatus = data1;
+ option.data = [];//娓呯┖瀛愯〃
+ $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+ $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
+ $("#HProjectID").val(checkStatus.data[0].HProjectID);
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ for (var j = 0; j < checkStatus.data.length; j++) {
+ var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+ var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+ var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+ var HNewlineTotal = HNewMoney + HNewTaxMoney;
+ option.data.push({
+ "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+ "HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅, "HQtyMust": checkStatus.data[j].鏁伴噺, "HQty": HNewQty, "HRemark": "",
+ "HPrice": checkStatus.data[j].鍗曚环, "HMoney": HNewMoney, "HOrderPrice": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+ "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+ "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HlineTotal": HNewlineTotal
+ })
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
+ }
+ });
+ } else {
+ return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+ }
+ }
+ //#endregion
+
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
var HOrgID = $("#HOrgID").val();
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 328117f..210c9b8 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -193,6 +193,7 @@
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="position: relative; bottom: 0;"></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="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -251,7 +252,8 @@
var sWhere = "";
var option = [];
var HModName = "Kf_POStockInBillList";
-
+ var page = 1;//鍒嗛〉鏁版嵁
+ var size = 50;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1201";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -283,12 +285,21 @@
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery();
+ }
});
//#endregion
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option,2);
+ if (page != 1) {
+ $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+ } else {
+ get_FastQuery(table, option, 2);
+ }
});
//#endregion
@@ -353,7 +364,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-180'
- , page: true
+ , page: false
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -416,6 +427,28 @@
]]
};
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 1000, 2000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ page = obj.curr;
+ size = obj.limit;
+ get_FastQuery();
+ }
+ }
+ }
+ laypage.render(optionPage);
}
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
@@ -526,6 +559,85 @@
}
});
}
+
+ //#region 鍒嗛〉鏌ヨ
+ function get_DisplayPage(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/page',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+ success: function (data1) {
+ option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ 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', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.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: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+ return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ laypage.render(optionPage);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "1201";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ //option.data = [[]]
+ //table.render(option);
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -798,7 +910,7 @@
//}
//sWhere += " and 鍏抽棴浜� =''";
sWhere += addSWhereByOpenType();
- get_Display(sWhere);
+ get_DisplayPage(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -830,8 +942,8 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
+ //set_ClearQuery();
+ get_DisplayPage(sWhere);
}
//#endregion
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
index 07d4c25..3266523 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillListQuery.html"
@@ -209,7 +209,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
</div>
</script>
- <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
+ <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
<script type="text/html" id="toolbarDemoSub">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>琛屽叧闂�</button>
@@ -446,7 +446,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
- /*get_FastQuery(table, option,1)*/
+ get_FastQuery(table, option,1)
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
@@ -567,8 +567,8 @@
optionSub = {
elem: '#mainTableSub'
, toolbar: '#toolbarDemoSub'
- , height: 'full-500'
- , page: true
+ //, height: 'full-500'
+ , page: false
, totalRow: true
, cellMinWidth: 90
, limit: 50
@@ -586,6 +586,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBill/QueryList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
@@ -604,7 +605,7 @@
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣'});
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1546,13 +1547,26 @@
//#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;
+ }
+ });
//鏄剧ず瀛愯〃
get_DisplaySub(obj.data);
- //鍒ゆ柇鏄惁宸茬粡琚�変腑
- if (obj.tr.find('.layui-form-radioed').length == 0) {
- //瑙﹀彂鍗曢�夋閫変腑浜嬩欢
- obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
- }
+
})
@@ -1855,7 +1869,7 @@
var addSWhere = "";
if (openType == 2) {
- addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' and HOrgID = " + HOrgID;
+ addSWhere = " and 瀹℃牳浜�! = '' and 鍏抽棴浜� = ''";
}
return addSWhere;
}
--
Gitblit v1.9.1