From 63ba619e1a67b46156c22a45edb1e38d6d1663c3 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期四, 05 九月 2024 15:24:49 +0800
Subject: [PATCH] 设备工艺参数数采
---
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 1
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 194 +
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 20
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 3
WebTM/views/领料发货/销售出库/Kf_SellOutBill.html | 5
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 133 +
WebTM/views/IpadIndex.html | 39
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 83
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 3
WebTM/views/采购管理/退料通知单/Add_Edit_Cg_POInStockBackBillList.html | 6
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 4
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 37
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 8
WebTM/views/grf/流转卡TK.grf | 725 ++++++++++
WebTM/views/销售管理/收款单/YS_ReceiveBill.html | 6
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 226 +++
WebTM/views/index.html | 2
WebTM/views/基础资料/公用基础资料/grf/流转卡TK.grf | 725 ++++++++++
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 2
WebTM/views/车间管理/单品过站/SingleItemTransitList.html | 294 ++++
WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html | 32
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 2
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 655 +++++++-
WebTM/views/车间管理/报表分析/Sc_HICMMaterStatisticsList.html | 13
WebTM/views/模治具管理/器具报表/Sc_MouldLifeUsePicReport.html | 290 ---
WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html | 5
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 136 +
WebTM/views/采购管理/采购合同/Add_Edit_Cg_ContractBillList.html | 2
WebTM/views/车间管理/报表分析/Sc_HMaterYieldStatisticsList.html | 13
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 10
WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html | 2
WebTM/views/销售管理/应收单/Xs_ReceivableBill.html | 5
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 14
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 23
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 27
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 75
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 36
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 77
WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html | 134 +
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 12
WebTM/WebTM.csproj | 3
WebTM/views/生产管理/生产报表/Sc_QualityReportBillDay.html | 47
44 files changed, 3,451 insertions(+), 682 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 50e5700..744463d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -486,7 +486,6 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
- <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_PPMReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityMonthSumReport.html" />
@@ -515,6 +514,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
@@ -525,6 +525,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_BatchSplit.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_HeatTreatmentTemperatureCurveChart.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 6cd52dd..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 4f05e24..c7a58b5 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
// 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/API/";*/ // 娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 8e45e25..1089c80 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1071,7 +1071,7 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
- if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鏂帿灏旀眹鎶�")) {
layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
return false;
}
@@ -1330,26 +1330,23 @@
function WorkStaus(HSourceID1, workcode, HSourceInterID, btn) {
var flag = false;
var sWhere = "";
- sWhere = {
- HSourceID: HSourceID1
- , HICMOBillNo: workcode
- , HInterID: HSourceInterID
- , type: btn
- }
- //switch (btn) {
- // case "寮�宸�":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
- // break;
- // case "瀹屽伐":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
- // break;
- // case "鍋滃伐":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
- // break;
- // case "姹囨姤":
- // sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
- // break;
- // case "鎶ユ鐢宠":
+ switch (btn) {
+ case "寮�宸�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
+ break;
+ case "瀹屽伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
+ break;
+ case "鍋滃伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
+ break;
+ case "姹囨姤":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
+ case "鏂帿灏旀眹鎶�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HSourceBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
+ case "鎶ユ鐢宠":
// break;
// default:
diff --git "a/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf" "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /dev/null
+++ "b/WebTM/views/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 45725c9..1cddf4a 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -587,6 +587,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ProdProcessSumReport_DyeColor_third.html">鏌撳巶浜ч噺鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MateOutSumReport_QiaoYi.html">棰嗘枡缁熻鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_SPCOscillationCurve.html">SPC闇囪崱鏇茬嚎鍥�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_HeatTreatmentTemperatureCurveChart.html">鐑鐞嗘俯搴︽洸绾垮浘</a></dd>
</dl>
</dd>
<dd>
@@ -620,6 +621,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Sc_SourceLineRepairBillList.html">杩斾慨璁板綍鍒楄〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">璐ㄩ噺杩芥函鏌ヨ</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/BadQueryReport.html">閫嗗悜杩芥函鏌ヨ鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/SingleItemTransitList.html">鍗曞搧杩囩珯鏌ヨ</a></dd>
</dl>
</dd>
<dd>
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_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 64f6691..e2e88f9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -101,15 +101,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<label class="layui-form-label">鍏嬮噸</label>
@@ -229,7 +229,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓�娆″悎鏍�<br/>鐜囨爣鍑嗗��</label>
+ <label class="layui-form-label">涓�娆″悎鏍�<br />鐜囨爣鍑嗗��</label>
<div class="layui-input-inline">
<input class="layui-input" name="HOnceRightRate" id="HOnceRightRate" autocomplete="off" onfocus="this.select();" value="0" style="margin-top:10px;">
</div>
@@ -332,8 +332,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -432,9 +432,9 @@
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -503,14 +503,25 @@
</button>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">浜嬩笟閮細</label>
+ <div class="layui-input-inline">
+ <div class="layui-form-item">
+ <select name="HDivisionID" id="HDivisionID" lay-verify="HDivisionID">
+ <option value="0" selected>璇烽�夋嫨</option>
+ <option value="3" selected>娉ㄥ浜嬩笟閮�</option>
+ <option value="4">杞浜嬩笟閮�</option>
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -533,6 +544,12 @@
<label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 娴佽浆鍗℃暟閲忥細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HLotcardQty" lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off" value="0">
</div>
</div>
</div>
@@ -790,7 +807,7 @@
if (OperationType == 4) {
$("#HNumber").attr("readonly", true);
setHNumber(HMaterTypeID);
-
+
}
$(this).removeAttr("lay-key");
@@ -907,8 +924,8 @@
} else {
var TaxRate = $("#HTaxRate").val();
var HProfitRate = $("#HProfitRate").val();
- var HTaxCost = Number((value * (100 + TaxRate*1) / 100).toFixed(4)) //鍚◣鎴愭湰浠� = 涓嶅惈绋庢垚鏈� * 锛�100 + 绋庣巼锛�/100
- var HFootPrice = Number((HTaxCost * (100 + HProfitRate*1) / 100).toFixed(4))// 缁撶畻浠� = 鍚◣鎴愭湰浠� * 锛�100+ 鍒╂鼎鐜囷級/100
+ var HTaxCost = Number((value * (100 + TaxRate * 1) / 100).toFixed(4)) //鍚◣鎴愭湰浠� = 涓嶅惈绋庢垚鏈� * 锛�100 + 绋庣巼锛�/100
+ var HFootPrice = Number((HTaxCost * (100 + HProfitRate * 1) / 100).toFixed(4))// 缁撶畻浠� = 鍚◣鎴愭湰浠� * 锛�100+ 鍒╂鼎鐜囷級/100
$("#HTaxCost").val(HTaxCost);
$("#HFootPrice").val(HFootPrice);
}
@@ -923,8 +940,8 @@
} else {
var TaxRate = $("#HTaxRate").val();
var HProfitRate = $("#HProfitRate").val();
- var HNoTaxCost = Number((value / (100 + TaxRate*1) * 100).toFixed(4))//涓嶅惈绋庢垚鏈环 = 鍚◣鎴愭湰/ 锛�100 + 绋庣巼锛�/100 缁撶畻浠�
- var HFootPrice = Number((value * (100 + HProfitRate*1) / 100).toFixed(4))
+ var HNoTaxCost = Number((value / (100 + TaxRate * 1) * 100).toFixed(4))//涓嶅惈绋庢垚鏈环 = 鍚◣鎴愭湰/ 锛�100 + 绋庣巼锛�/100 缁撶畻浠�
+ var HFootPrice = Number((value * (100 + HProfitRate * 1) / 100).toFixed(4))
$("#HNoTaxCost").val(HNoTaxCost);
$("#HFootPrice").val(HFootPrice);
}
@@ -1074,7 +1091,7 @@
, "HTela_M": data.姣涚罕鍚嶇О鍙婅鏍�
, "HUnderTela_M": data.搴曚笣
, "HSizing_M": data.瀹氬瀷娴嗘枡
-
+ , "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
});
@@ -1099,7 +1116,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Material/getMaxNum',
type: "GET",
- data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
+ data: { "HMaterTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
success: function (data1) {
if (data1.data != null) {
layer.close(ajaxLoad);
@@ -1320,6 +1337,18 @@
} else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HMinPickQty)) {
+ layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HLotcardQty = $('#HLotcardQty').val();
+ if (HLotcardQty.substring(HLotcardQty.length - 1, HLotcardQty.length) == ".") {
+ layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HLotcardQty)) {
layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
return;
}
@@ -1656,8 +1685,6 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- console.log(checkStatus.data[0].椤圭洰缁�);
- console.log(checkStatus.data[0].HInterID);
$("#HProjectName").val(checkStatus.data[0].椤圭洰缁�);
$("#HProjectBillMainID ").val(checkStatus.data[0].HInterID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
index 6bf1ae3..d7d98c0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
@@ -145,6 +145,7 @@
var option = [];
let that = this;
var HModName = "Gy_CheckItem";
+ var HQCCheckNum = [];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","ParentID"];
//tree.render({
@@ -206,6 +207,14 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ HQCCheckNum = [];//鎿嶄綔绫诲瀷
+ } else if (params[params[0]] == "SPC") {
+ HQCCheckNum = params[params[1]];//鎿嶄綔绫诲瀷
+ }
+
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -276,7 +285,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
get_DefaultModule();
@@ -419,6 +428,10 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+
+ if (HQCCheckNum.length > 0) {
+ sWhere += " and HItemID in (" + HQCCheckNum.toString() + ")";
}
if (HNumber) {
sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
@@ -1090,6 +1103,18 @@
}
});
}
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//#endregion
</script>
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/grf/\346\265\201\350\275\254\345\215\241TK.grf" "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/grf/\346\265\201\350\275\254\345\215\241TK.grf"
new file mode 100644
index 0000000..a00f322
--- /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/grf/\346\265\201\350\275\254\345\215\241TK.grf"
@@ -0,0 +1,725 @@
+锘縊bject Report
+ Version='6.8.9.1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ LeftMargin=1.5
+ TopMargin=1.5
+ RightMargin=1.5
+ BottomMargin=1.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy/MM/dd'
+ End
+ Item
+ Name='浠诲姟鍗曞彿'
+ End
+ Item
+ Name='娲惧伐鍗曞彿'
+ End
+ Item
+ Name='鐢熶骇杞﹂棿'
+ End
+ Item
+ Name='浜у搧浠ｇ爜'
+ End
+ Item
+ Name='浜у搧鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='鐢熶骇鏁伴噺'
+ End
+ Item
+ Name='鍗℃暟閲�'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='宸ュ簭鍙�'
+ End
+ Item
+ Name='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Name='宸ュ簭鍚嶇О'
+ End
+ Item
+ Name='鐝粍'
+ End
+ Item
+ Name='鏈哄彴'
+ End
+ Item
+ Name='瀹炰綔鏁伴噺'
+ End
+ Item
+ Name='宸ュ簭璇存槑'
+ End
+ Item
+ Name='鐝彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='Column14'
+ Width=1.69333
+ End
+ Item
+ Name='Column1'
+ Width=1.87854
+ End
+ Item
+ Name='Column2'
+ Width=2.77813
+ End
+ Item
+ Name='Column3'
+ Width=1.61396
+ End
+ Item
+ Name='Column8'
+ Width=2.80458
+ End
+ Item
+ Name='Column9'
+ Width=2.01083
+ End
+ Item
+ Name='Column12'
+ Width=3.38667
+ End
+ Item
+ Name='Column15'
+ Width=1.79917
+ End
+ End
+Object ColumnContent
+ Height=1.19063
+ AdjustRowHeight=F
+ RowsPerPage=6
+ Items ColumnContentCell
+ Item
+ Column='Column14'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox3'
+ Left=0.5
+ Top=-0.8
+ Width=1.5875
+ Height=0.608542
+ SystemVar=RowNo
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox14'
+ Dock=Fill
+ DataField='宸ュ簭鍙�'
+ End
+ End
+ End
+ Item
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭浠ｇ爜'
+ End
+ Item
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ CanGrow=T
+ CanShrink=T
+ ShrinkFontToFit=T
+ DataField='宸ュ簭鍚嶇О'
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='鐝粍'
+ End
+ Item
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ DataField='鏈哄彴'
+ End
+ Item
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ ShrinkFontToFit=T
+ DataField='瀹炰綔鏁伴噺'
+ End
+ Item
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ DataField='宸ュ簭璇存槑'
+ End
+ Item
+ Column='Column15'
+ DataField='鐝彿'
+ End
+End
+End
+Object ColumnTitle
+ Height=1.19063
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='Column14'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='Column1'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鐝粍'
+ End
+ Item
+ GroupTitle=F
+ Column='Column8'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鏈哄彴'
+ End
+ Item
+ GroupTitle=F
+ Column='Column9'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='瀹炰綔鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column12'
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='宸ュ簭璇存槑'
+ End
+ Item
+ GroupTitle=F
+ Column='Column15'
+ TextAlign=MiddleCenter
+ Text='鐝彿'
+ End
+ End
+End
+End
+Items Parameter
+ Item
+ Name='椤电爜'
+ End
+End
+Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ CanGrow=T
+ CanShrink=T
+ Height=4.60375
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Bold=T
+ Charset=134
+ End
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox1'
+ Left=5.00063
+ Width=4.78896
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='娴佽浆鍗�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=11.5888
+ Top=2.19604
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=4.20688
+ Top=1.00542
+ Width=2.98979
+ Height=0.608542
+ TextAlign=MiddleCenter
+ Text='QC妫�鏌ユ柟寮忥細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox8'
+ Left=5.60917
+ Top=2.19604
+ Width=1.40229
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鏃ユ湡锛�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Left=13.2027
+ Top=2.19604
+ Width=3.99521
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鐢熶骇杞﹂棿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox6'
+ Left=6.61458
+ Top=2.19604
+ Width=3.78354
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='鏃ユ湡'
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Left=16.5894
+ Top=1.19063
+ Width=2.80458
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='鍏�0椤�'
+ SystemVar=PageCount
+ End
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox2'
+ Left=15.3988
+ Top=1.19063
+ Width=2.40771
+ Height=0.423333
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Format='绗�0椤�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox18'
+ Left=0.79375
+ Top=2.98979
+ Width=2.61938
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧浠ｇ爜锛�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox19'
+ Left=0.79375
+ Top=2.19604
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='娲惧伐鍗�'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox9'
+ Left=2.40771
+ Top=2.19604
+ Width=2.38125
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='娲惧伐鍗曞彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox10'
+ Left=2.59292
+ Top=2.98979
+ Width=1.79917
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ DataField='浜у搧浠ｇ爜'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox21'
+ Left=11.5888
+ Top=3.81
+ Width=2.80458
+ Height=0.582083
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鎵规锛�'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=12.1973
+ Top=0.79375
+ Width=1.98438
+ Height=1.21708
+ BarcodeType=QRCode
+ CaptionPosition=None
+ CaptionAlignment=Far
+ CheckSum=T
+ Text='#鍗曟嵁鍙�#'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox11'
+ Left=12.5942
+ Top=3.81
+ Width=4.60375
+ Height=0.582083
+ DataField='鎵规'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode2'
+ Left=1.5875
+ Top=0.608542
+ Width=2.59292
+ Height=1.40229
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='#浠诲姟鍗曞彿#'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox1'
+ Left=10.795
+ Top=0.211667
+ Width=1.79917
+ Height=0.582083
+ Text='娴佽浆鍗″彿'
+ End
+ Item
+ Type=FieldBox
+ Name='FieldBox13'
+ Left=12.5942
+ Top=0.211667
+ Width=4.20688
+ Height=0.582083
+ DataField='鍗曟嵁鍙�'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox24'
+ Left=0.211667
+ Width=5.79438
+ Height=0.582083
+ Text='浠诲姟鍗曞彿锛歔#浠诲姟鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox25'
+ Left=7.19667
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=8.59896
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox26'
+ Left=9.60438
+ Top=1.00542
+ Width=1.19063
+ Height=0.608542
+ Text='鎶芥'
+ End
+ Item
+ Type=ShapeBox
+ Name='ShapeBox2'
+ Left=11.0067
+ Top=1.00542
+ Width=0.608542
+ Height=0.582083
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox27'
+ Left=5.60917
+ Top=2.98979
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='浜у搧鍚嶇О锛歔#浜у搧鍚嶇О#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox28'
+ Left=11.5888
+ Top=2.98979
+ Width=6.21771
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='瑙勬牸鍨嬪彿锛歔#瑙勬牸鍨嬪彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox29'
+ Left=0.79375
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鐢熶骇鏁伴噺锛歔#鐢熶骇鏁伴噺#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox30'
+ Left=5.60917
+ Top=3.81
+ Width=4.60375
+ Height=0.608542
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Bold=T
+ Charset=134
+ End
+ Text='鍗℃暟閲忥細[#鍗℃暟閲�#]'
+ End
+ End
+ RepeatOnPage=T
+End
+End
+Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=2.01083
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Dock=Left
+ Object Border
+ Styles=[DrawLeft|DrawRight|DrawBottom]
+ End
+ ColumnCount=7
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=1.6933
+ End
+ Item[2]
+ Width=1.8785
+ End
+ Item[3]
+ Width=2.7781
+ End
+ Item[4]
+ Width=1.614
+ End
+ Item[5]
+ Width=2.8046
+ End
+ Item[6]
+ Width=2.01083
+ End
+ Item[7]
+ Width=5.18583
+ End
+ End
+ Items FreeGridRow
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Text='鍏ュ簱璁板綍'
+ End
+ Item[2,1]
+ Text='棰嗙敤璁板綍'
+ End
+ End
+End
+End
+End
+End
+End
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
index 5b68379..b20ffc2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUsePicReport.html"
@@ -32,13 +32,6 @@
</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;">
@@ -51,11 +44,14 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">妯″叿缂栧彿</label>
+ <label class="layui-form-label" >妯″叿缂栧彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMouldNo" id="HMouldNo" style="width:190px;">
+ <input type="text" class="layui-input" lay-verify="HMouldNo" name="HMouldNo" id="HMouldNo" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouldNo" id="btnHMouldNo" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">妯″叿鍚嶇О</label>
<div class="layui-input-block">
@@ -65,90 +61,7 @@
<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" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
- </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<div>
@@ -159,13 +72,7 @@
</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="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>
@@ -238,6 +145,43 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+ //宸ュ簭
+ form.on('submit(btnHMouldNo)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妯″叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMouldNo").val(checkStatus.data[0].妯″叿缂栧彿);
+ $("#HName").val(checkStatus.data[0].妯″叿鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -260,43 +204,14 @@
});
})
//#endregion
-
- //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
- 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);
- }
- });
+
//#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"));
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 3)), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃
set_InitGrid();
@@ -397,82 +312,7 @@
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HMouldNo = $("#HMouldNo").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;
- }
+ var HName = $("#HName").val();
if (HBeginDate) {
sWhere += " and CONVERT(varchar(7),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -506,41 +346,15 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 3)), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
- $("#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");
+ $("#btnSearch").click();
form.render('select');
sWhere = "";
}
- //#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
+
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index f63257a..da025eb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -508,6 +508,7 @@
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true}
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true}
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160, sort: true}
, {
field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, sort: true, templet: function (d) {
if (d.鍗曟嵁绫诲瀷 == "3788") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index 5b3096a..a9841ef 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -494,7 +494,8 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true}
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true}
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true}
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160, sort: true }
, {
field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, sort: true, templet: function (d) {
if (d.鍗曟嵁绫诲瀷 == "3787") {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html"
index d3a6d61..e3aa308 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html"
@@ -53,10 +53,30 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</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-row" style="margin-top:5px;margin-left:82px;margin-bottom: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 ForFilteringSchemes" name="HProcName" id="HProcName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HEquipName" id="HEquipName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎵规鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBactNo" id="HBactNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -182,6 +202,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -211,15 +232,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
switch (data[i].Type) {
- //int
case 'DateTime':
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
break;
default:
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -234,6 +260,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -270,13 +297,19 @@
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
+ var HName = $("#HName").val();
+ var HProcName = $("#HProcName").val();
+ var HEquipName = $("#HEquipName").val();
+ var HBactNo = $("#HBactNo").val();
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
, HNumber: HNumber
, HName: HName
+ , HProcName: HProcName
+ , HEquipName: HEquipName
+ , HBactNo: HBactNo
}
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 6c615ff..52d9572 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -42,7 +42,7 @@
</select>
</div>
</div>
- <div class="layui-inline "style="display:none">
+ <div class="layui-inline " style="display:none">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 120px; width: 120px;">
<select name="HWorkCenter" id="HWorkCenter" lay-verify="HWorkCenter">
@@ -57,6 +57,18 @@
<input type="text" class="layui-input" id="HName" 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" 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" id="HEndDate" style="width:190px;">
+ </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>
@@ -69,12 +81,13 @@
<div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
</div>
- <div style="width:99%;height:calc(30vh);">
+ <div style="width:99%;height:calc(50vh);">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="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="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -107,6 +120,7 @@
var option = [];
var HModName = "Sc_QualityReportBillMonth";
var HDeptID = 0;
+ var ins;
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -161,7 +175,7 @@
// 濉厖鏁版嵁
for (let i = 0; i < H_X.length; i++) {
let month = i + 1; // 1鍒�12鐨勬湀浠�
- let year = $("#Hyear").val(); // 褰撳墠骞翠唤
+ let year = $("#HYear").val(); // 褰撳墠骞翠唤
// 灏� monthlyTotals 涓殑鏁伴噺濉厖鍒� HProcSumNum 涓�
if (monthlyTotals[year] && monthlyTotals[year][month]) {
@@ -257,10 +271,7 @@
yAxis: [
{
type: 'value',
- name: '鐢熶骇鏁伴噺',
- //min: 0,
- //max: 200000,
- //interval: 10000,
+ name: '鐢熶骇鏁伴噺',
axisLabel: {
formatter: '{value}'
}
@@ -279,24 +290,44 @@
series: [
{
name: '娉ㄥ鏁伴噺',
- type: 'bar',
+ type: 'bar',
tooltip: {
valueFormatter: function (value) {
return value;
}
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#0000FF' // 璁剧疆鏌辩姸鍥鹃粦鑹�
},
data: HProcSumNum
},
{
name: '娉ㄥ鑹巼',
type: 'line',
- yAxisIndex: 1,
+ yAxisIndex: 1,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
data: HQualifiedNum
},
{
name: '鍏ㄦ鑹巼',
type: 'line',
- yAxisIndex: 1,
+ yAxisIndex: 1,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
data: HFirstPassRate
}
]
@@ -313,6 +344,10 @@
//閫�鍑�
case 'btn-exit': Pub_Close(2);
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
@@ -326,7 +361,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//閫�鍑烘寜閽�
@@ -345,11 +380,12 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
Year();
-
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 6)), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
+ get_FastQuery(1);
//鍔犺浇鏌辩姸鍥�
set_Graphics();
@@ -372,13 +408,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: '200px'
+ , height: '600px'
, totalRow: true
, page: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
}
}
@@ -390,10 +425,10 @@
type: "GET",
async: false,
data: { "sWhere": sWhere ,"user": sessionStorage["HUserName"] },
- success: function (data1) {
- var col = [];
+ success: function (data1) {
if (data1.count == 1) {
var data = [];
+ var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -410,28 +445,33 @@
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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
default:
col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
}
}
- //if (data1.data.length>0) {
- // for (let i = 1; i <= 12; i++) {
- // if (data1.data[0][i + "鏈�"] != 0) {
- // data1.data[3][i + "鏈�"] = (data1.data[3][i + "鏈�"]).toFixed(2) + '%'
- // }
- // else {
- // data1.data[3][i + "鏈�"] = (0.00).toFixed(2) + '%'
- // }
- // }
- // data1.data[3].鍚堣 = (data1.data[3].鍚堣).toFixed(2) + '%'
- //}
-
-
- option.cols = [col];
- option.data = data1.data;
-
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , totalRow: true
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -445,17 +485,21 @@
}
//蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
var HYear = $("#HYear").val(); //骞翠唤
var HWorkCenter = $("#HWorkCenter").val() != null ? '': $("#HWorkCenter").val(); //宸ヤ綔涓績
var HName = $("#HName").val();//鐗╂枡鍚嶇О
-
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
sWhere = {
HYear: HYear
, HWorkCenter: HWorkCenter
, HName: HName
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
}
get_Display(JSON.stringify(sWhere));
+
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
//鍔犺浇鏌辩姸鍥�
@@ -468,6 +512,28 @@
get_Display(JSON.stringify(sWhere));
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
index 967f337..129360f 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_MaterialTechParamBillMain.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_MaterialTechParamBillMain.html"
@@ -974,7 +974,7 @@
"HStd": "0",
"HMax": "0",
"HMin": "0",
- "HDataForm": "鎵嬪伐褰曞叆",
+ "HDataForm": "璁惧閲囬泦",
"HDataUnit": "绉�",
"HDataTimes": "0",
"HTechParamClassID": "0",
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 b4b4428..737032d 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"
@@ -592,11 +592,11 @@
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', width: 100 }
- , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', width: 100 ,hide: true,}
- , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 120, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamClassID', title: '宸ヨ壓鍙傛暟澶х被', width: 100, hide: true, }
+ , { field: 'HTechParamClassName', title: '宸ヨ壓鍙傛暟澶х被鍚嶇О', width: 120, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamID', title: 'HTechParamID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamNumber', title: '宸ヨ壓鍙傛暟浠ｇ爜', width: 110, edit: 'text', event: "HTechParamNumber" } //F7
- , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' }
+ , { field: 'HTechParamName', title: '宸ヨ壓鍙傛暟鍚嶇О', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamUnitID', title: 'HTechParamUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamUnitNumber', title: '宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜', width: 130, edit: 'text', event: "HTechParamUnitNumber" } //F7
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
@@ -604,14 +604,14 @@
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
, { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
- , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text' }
+ , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
- , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
+ , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ ]]
}
var rowdata = [{
@@ -1227,25 +1227,47 @@
//#region 琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ set_GridDelete(obj); // 琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); // 琛屽唴蹇嵎閿瓫閫�
- var data = obj.data;
- if (obj.event == 'HDate') {
- var field = $(this).data('field');
- laydate.render({
- elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
- , closeStop: this
- , done: function (nowDate) {
- //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
- data[field] = nowDate;
- obj.update(data);
- }
- });
+ if (obj.event === 'HVaule') {
+ var field = obj.event; // 鑾峰彇瀛楁
+ var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
+ var cell = obj.tr.find('td[data-field="' + field + '"]'); // 鑾峰彇鍗曞厓鏍煎厓绱�
+
+ if (row['HRemark'] === '璁惧閲囬泦') {
+ layer.msg('姝ゅ崟鍏冩牸鐨勫�间负鈥滆澶囬噰闆嗏��,鏃犳硶缂栬緫'); // 鎻愮ず淇℃伅
+ cell.removeAttr('contenteditable'); // 纭繚鍗曞厓鏍间笉琚紪杈�
+ } else {
+ cell.attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
+ cell.focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
+ }
}
});
- //#endregion
+
+ // 鐩戝惉鍗曞厓鏍肩紪杈戠粨鏉熶簨浠�
+ $(document).on('blur', '[contenteditable]', function () {
+ var cell = $(this);
+ var newValue = cell.text(); // 鑾峰彇鏂板��
+ var field = cell.data('field'); // 鑾峰彇瀛楁
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
+
+ // 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ var updatedData = table.cache['mainTable'].map(function (item) {
+ if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ item[field] = newValue;
+ }
+ return item;
+ });
+
+ layui.table.reload('mainTable', {
+ data: updatedData
+ });
+
+ // 鍙栨秷缂栬緫鐘舵��
+ cell.removeAttr('contenteditable');
+ });
+
//#region 琛屽唴鍒犻櫎
function set_GridDelete(obj) {
@@ -1423,20 +1445,21 @@
{
"HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamClassName": result.data[i]["宸ヨ壓鍙傛暟澶х被鍚嶇О"],
- "HTechParamID": result.data[i]["HTechParamID"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HTechParamID": result.data[i]["HTechParamID"] == null ? 0 : result.data[i]["HTechParamID"],
"HTechParamNumber": result.data[i]["宸ヨ壓鍙傛暟浠ｇ爜"],
"HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"],
- "HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamUnitID"],
"HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
"HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"] ,
- "HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["HTechParamClassID"],
- "HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["宸ヨ壓娆″簭"],
+ "HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamIDStd"],
"HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
"HResultStd": "",
"HVaule": result.data[i]["鏁伴噰鍊�"],
"HStd": result.data[i]["鏍囧噯鍊�"],
"HMax": result.data[i]["涓婇檺鍊�"],
"HMin": result.data[i]["涓嬮檺鍊�"],
+ "HRemark": result.data[i]["閲囬泦鏉ユ簮"]
}
);
}
@@ -1455,7 +1478,7 @@
})
}
//#endregion
-
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
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 9d9133e..4e17246 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"
@@ -88,41 +88,43 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
- <div class="layui-col-xs7 layui-inline" style="margin-top:20px;">
- <ul class="layui-tab-title">
- <li class="layui-this">浜�</li>
- <li>鏈�</li>
- <li>鏂�</li>
- <li>娉�</li>
- <li>鐜�</li>
- <li>娴�</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <!--浜�-->
- <table class="layui-hide" id="mainTable_Man" lay-filter="mainTable_Man"></table>
+ <div class="layui-col-xs7 layui-inline" style="margin-top:20px;">
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">浜�</li>
+ <li>鏈�</li>
+ <li>鏂�</li>
+ <li>娉�</li>
+ <li>鐜�</li>
+ <li>娴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浜�-->
+ <table class="layui-hide" id="mainTable_Man" lay-filter="mainTable_Man"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏈�-->
+ <table class="layui-hide" id="mainTable_Machine" lay-filter="mainTable_Machine"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏂�-->
+ <table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娉�-->
+ <table class="layui-hide" id="mainTable_Method" lay-filter="mainTable_Method"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鐜�-->
+ <table class="layui-hide" id="mainTable_Environments" lay-filter="mainTable_Environments"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娴�-->
+ <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
+ </div>
</div>
- <div class="layui-tab-item">
- <!--鏈�-->
- <table class="layui-hide" id="mainTable_Machine" lay-filter="mainTable_Machine"></table>
- </div>
- <div class="layui-tab-item">
- <!--鏂�-->
- <table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
- </div>
- <div class="layui-tab-item">
- <!--娉�-->
- <table class="layui-hide" id="mainTable_Method" lay-filter="mainTable_Method"></table>
- </div>
- <div class="layui-tab-item">
- <!--鐜�-->
- <table class="layui-hide" id="mainTable_Environments" lay-filter="mainTable_Environments"></table>
- </div>
- <div class="layui-tab-item">
- <!--娴�-->
- <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
- </div>
- </div>
+ </div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -166,7 +168,7 @@
//
var HModName = "QC_FiveMenOneRingList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
- var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id", "涓荤敓浜ц鍗�", "閰嶄欢鐢熶骇璁㈠崟", "鎴愬搧鐗╂枡浠ｇ爜", "鎴愬搧瑙勬牸鍨嬪彿", "閰嶄欢鐗╂枡浠ｇ爜", "閰嶄欢瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d"];
+ var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id", "涓荤敓浜ц鍗�", "閰嶄欢鐢熶骇璁㈠崟", "鎴愬搧鐗╂枡浠ｇ爜", "鎴愬搧瑙勬牸鍨嬪彿", "閰嶄欢鐗╂枡浠ｇ爜", "閰嶄欢瑙勬牸鍨嬪彿", "鍗曟嵁涓籭d","鐗╂枡id","鐢熶骇璧勬簮id","鑱屽憳id","妯″叿id"];
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -190,7 +192,7 @@
//#endregion
//#region SN鐮佸洖杞︽柟娉�
- $('#HICNumber').on('keydown', function (event) {
+ $('#SN').on('keydown', function (event) {
if (event.keyCode == 13) {
get_FastQuery();//鏌ヨ
}
@@ -363,25 +365,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '涓绘祦杞崱id', title: '涓绘祦杞崱id', sort: true, hide: true }
- // , { field: '涓绘祦杞崱', title: '涓绘祦杞崱', sort: true }
- // , { field: '涓荤敓浜ц鍗�', title: '涓荤敓浜ц鍗�', sort: true }
- // , { field: '閰嶄欢娴佽浆鍗d ', title: '閰嶄欢娴佽浆鍗d ', sort: true, hide: true }
- // , { field: '閰嶄欢娴佽浆鍗� ', title: '閰嶄欢娴佽浆鍗� ', sort: true }
- // , { field: '閰嶄欢鐢熶骇璁㈠崟 ', title: '閰嶄欢鐢熶骇璁㈠崟 ', sort: true }
- // , { field: '鎴愬搧鐗╂枡id ', title: '鎴愬搧鐗╂枡id ', sort: true, hide: true }
- // , { field: '鎴愬搧鐗╂枡浠ｇ爜 ', title: '鎴愬搧鐗╂枡浠ｇ爜 ', sort: true }
- // , { field: '鎴愬搧鐗╂枡 ', title: '鎴愬搧鐗╂枡 ', sort: true }
- // , { field: '鎴愬搧瑙勬牸鍨嬪彿 ', title: '鎴愬搧瑙勬牸鍨嬪彿 ', sort: true }
- // , { field: '閰嶄欢鐗╂枡id ', title: '閰嶄欢鐗╂枡id ', sort: true, hide: true }
- // , { field: '閰嶄欢鐗╂枡浠ｇ爜 ', title: '閰嶄欢鐗╂枡浠ｇ爜 ', sort: true }
- // , { field: '閰嶄欢鐗╂枡 ', title: '閰嶄欢鐗╂枡 ', sort: true }
- // , { field: '閰嶄欢瑙勬牸鍨嬪彿 ', title: '閰嶄欢瑙勬牸鍨嬪彿 ', sort: true }
- //]
- ]
+ , cols: []
,data:[]
};
}
@@ -397,15 +381,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -421,15 +397,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -445,15 +413,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -469,15 +429,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -491,15 +443,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -513,15 +457,7 @@
, totalRow: true
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , cols: [
- //[
- // { type: 'checkbox', totalRowText: '鍚堣琛�' }
- // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
- // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
- // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
- //]
- ]
+ , cols: []
, data: []
};
}
@@ -551,14 +487,28 @@
if ($.inArray(data[j].name, titleData) > -1) {
col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
+ else if (data[j].name == '閰嶄欢娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '閰嶄欢娴佽浆鍗�', templet: function (d) {
+ return '<span style="color: blue;">' + d.閰嶄欢娴佽浆鍗� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '涓绘祦杞崱') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].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) {
+ switch (data[j].Type) {
//int
case 'DateTime':
col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200});
}
}
}
@@ -657,32 +607,479 @@
}
//#endregion
-
- // 鑾峰彇鏍囩
- function getActiveTab() {
- var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
- var activeTab;
- for (var i = 0; i < tabs.length; i++) {
- if (tabs[i].classList.contains("layui-this")) {
- activeTab = tabs[i].innerText;
- break;
- }
- }
- return activeTab;
-
- }
-
- //涓昏〃鏍� 閰嶄欢娴佽浆鍗＄偣鍑绘椂闂�
+
//#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+
+ //#region 涓昏〃鏍� 娴佽浆鍗＄偣鍑绘椂闂�
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
+ var ajaxLoad = layer.load();
+ var linterid;
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '閰嶄欢娴佽浆鍗�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.閰嶄欢娴佽浆鍗d; //澹版槑鍙橀噺linterid 涓� data.hmainid
-
+ linterid = data.閰嶄欢娴佽浆鍗d;
+ } else if (obj.event == '涓绘祦杞崱') {
+ linterid = data.涓绘祦杞崱id;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
+ type: "GET",
+ data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[j].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '鑱屽憳') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '鑱屽憳', templet: function (d) {
+ return '<span style="color: blue;">' + d.鑱屽憳 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '妯″叿鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '妯″叿鍚嶇О', templet: function (d) {
+ return '<span style="color: blue;">' + d.妯″叿鍚嶇О + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else if (data[j].name == '璁惧鍚嶇О') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '璁惧鍚嶇О', templet: function (d) {
+ return '<span style="color: blue;">' + d.璁惧鍚嶇О + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
+ switch (data[j].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: data[j].name });
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+ //浜�
+ option_Man = {
+ elem: '#mainTable_Man'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Man);
+ //鏈�
+ option_Machine = {
+ elem: '#mainTable_Machine'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Machine);
+ //鏂�
+ option_Material = {
+ elem: '#mainTable_Material'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[2]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query2
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Material);
+ //娉�
+ option_Method = {
+ elem: '#mainTable_Method'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[3]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query3
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Method);
+ //鐜�
+ option_Environments = {
+ elem: '#mainTable_Environments'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[4]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query4
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Environments);
+ //娴�
+ option_Measure = {
+ elem: '#mainTable_Measure'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[5]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList_Query5
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Measure);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ });
+ //#endregion
+
+ //#region鍓〃鏍�
+ //浜�
+ table.on('tool(mainTable_Man)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ if (data.鍗曟嵁绫诲瀷=="宸ュ簭鍑虹珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍑虹珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅杩涚珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅寮�宸ュ崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
+ });
+
+ //鏈�
+ table.on('tool(mainTable_Machine)', function (obj) {
+ 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: '../../杞﹂棿绠＄悊/鍚姩鐐规鍗�/Sc_WorkBeginDotCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '妯″叿鍚嶇О') {
+ var linterid = data.妯″叿id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '璁惧鍚嶇О') {
+ var linterid = data.璁惧id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
}
});
+ //鏂�
+ table.on('tool(mainTable_Material)', function (obj) {
+ 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: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/闃查敊/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
+ //娉�
+ table.on('tool(mainTable_Method)', function (obj) {
+ 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 () {
+ }
+ })
+ } else if (obj.event == '鑱屽憳') {
+ var linterid = data.鑱屽憳id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鑱屽憳妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '妯″叿鍚嶇О') {
+ var linterid = data.妯″叿id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅妯″叿妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (obj.event == '璁惧鍚嶇О') {
+ var linterid = data.璁惧id;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅璁惧妗ｆ'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ });
+
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 9d30fab..a9c120f 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -193,6 +193,9 @@
<div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
</div>
+ <div id="histogram_SJZ" style="width:99.5%;height:calc(100vh);margin-top:15px;">
+
+ </div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -211,7 +214,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -230,6 +233,8 @@
var HModName = "QC_InspectionFormReport";
var optionAVG = [];
var optionS = [];
+ var optionSJZ = [];
+ var HQCCheckNum = [];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -239,7 +244,7 @@
//#endregion
-
+
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
@@ -259,13 +264,14 @@
form.on('submit(btnHMaterID)', function (data) {
btnHMaterID();
});
- //#endregion
+ //#endregion
//#region 妫�楠岄」鐩�
form.on('submit(btnHQCCheckItemID)', function (data) {
+ btnCheckProjectList(2);
btnHQCCheckItemID();
});
- //#endregion
+ //#endregion
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -313,7 +319,7 @@
}
});
});
-
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -337,8 +343,8 @@
var columns = [];
//columns.push({ type: 'numbers', title: '搴忓彿' });
- columns.push({ field:"Id", title: "搴忓彿", width: 70 });
-
+ columns.push({ field: "Id", title: "搴忓彿", width: 70 });
+
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿
@@ -415,14 +421,15 @@
option.cols = [col];
option.data = data1.data;
+ optionSJZ[0] = data1.data[0];
optionAVG[0] = data1.data[limit + 1];
optionS[0] = data1.data[limit + 2];
table.render(option);
- set_Line();
set_PPK();
set_CPK();
+ set_Line();
}
-
+
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -436,7 +443,7 @@
//PPK璁＄畻 x
function set_PPK() {
- var x_AVG =0;
+ var x_AVG = 0;
var x_SUM = 0;
var x_PPK = 0;
var numCount = 0
@@ -455,7 +462,7 @@
for (var j = 0; j < option.data.length - 3; j++) {
numCount += 1;
x_SUM = calc(x_SUM, parseFloat(((parseFloat(option.data[j][option.cols[0][i].field]) - x_AVG) ** 2).toFixed(6)), "+")
-
+
}
}
@@ -466,6 +473,11 @@
$("#HCenterline_S").val(x_PPK.toFixed(4));
}
+ //鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ if (limit == 1) {
+ $("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+"))
+ $("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-"))
+ }
//涓婇檺
if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
@@ -483,12 +495,15 @@
}
}
- //CPK璁＄畻 s
+ //CPK璁＄畻 s
function set_CPK() {
var x_AVG = 0;
var s_AVG = 0;
var s_CPK = 0;
var d2 = [1.128, 1.693, 2.059, 2.326, 2.534, 2.704, 2.847, 3.078, 3.173, 3.258, 3.336, 3.407, 3.472, 3.532, 3.588, 3.640, 3.689, 3.735, 3.778, 3.819, 3.858, 3.895, 3.931];
+ var A2 = [0,1.880, 1.023, 0.729, 0.577, 0.483, 0.419, 0.373, 0.337, 0.308];
+ var D3 = [0,0.000, 0.000, 0.000, 0.000, 0.000, 0.076, 0.136, 0.184, 0.223];
+ var D4 = [0,3.267, 2.574, 2.282, 2.114, 2.004, 1.924, 1.864, 1.816, 1.777];
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
@@ -515,17 +530,28 @@
s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
+ //鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ if (limit > 1) {
+ $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
+ $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
+ }
+
+
+ //宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
+ $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"))
+
//涓婇檺
if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()),"+"), s_AVG, "-"), (3 * s_CPK), "/");
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
$("#HCPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
- } else {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
+ } else {
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
@@ -540,7 +566,7 @@
var str1, // 杞崲涓哄瓧绗︿覆鐨勬暟瀛�
str2,
ws1 = 0,// ws1锛寃s2 鐢ㄦ潵瀛樺偍浼犲叆鐨刵um鐨勫皬鏁扮偣鍚庣殑鏁板瓧鐨勪綅鏁�
- ws2 = 0,// 璧嬮粯璁ゅ�硷紝瑙ｅ喅褰撴暣鏁板拰灏忔暟杩愮畻鏃跺�嶆暟璁＄畻閿欒瀵艰嚧鐨勭粨鏋滆宸�
+ ws2 = 0,// 璧嬮粯璁ゅ�硷紝瑙ｅ喅褰撴暣鏁板拰灏忔暟杩愮畻鏃跺�嶆暟璁＄畻閿欒瀵艰嚧鐨勭粨鏋滆宸�
bigger,// bigger鍜宻maller鐢ㄤ簬鍔狅紝鍑忥紝闄ゆ硶鎵惧嚭灏忕殑閭ｄ釜鏁板瓧锛岀粰鍚庨潰琛�0锛岃В鍐充綅鏁颁笉瀵逛粠鑰岄�犳垚鐨勮绠楅敊璇殑闂锛涗箻娉曢渶瑕佸皢缁撴灉闄や袱涓暟瀛楃殑鍊嶆暟涔嬪拰
smaller,// 渚嬪锛氬姞鍑忛櫎娉曚腑1.001 + 2.03 锛屽鏋滀笉缁�2.03杩涜琛�0锛屾渶鍚庝細鍙樻垚1001+203锛屾暟瀛楅敊浣嶅鑷寸粨鏋滈敊璇紱涔樻硶涓�1.12*1.1浼氭斁澶т负112*11锛屾墍浠ョ粨鏋滈渶瑕侀櫎浠�1000鎵嶄細鏄纭殑缁撴灉锛�112*11/1000=1.232
zeroCount, // 闇�瑕佽ˉ鍏�0鐨勪釜鏁�
@@ -562,7 +588,7 @@
if (isExistDot2) {
ws2 = str2.split('.')[1].length;
}
- // 濡倃s1 鍜� ws2 鏃犻粯璁ゅ�硷紝濡傛灉num1 鎴� num2 涓嶆槸灏忔暟鐨勮瘽鍒� ws1 鎴� ws2 鐨勫�煎皢涓� undefined
+ // 濡倃s1 鍜� ws2 鏃犻粯璁ゅ�硷紝濡傛灉num1 鎴� num2 涓嶆槸灏忔暟鐨勮瘽鍒� ws1 鎴� ws2 鐨勫�煎皢涓� undefined
// bigger 鍜� smaller 鐨勫�间細鍜岄鏈熶笉绗�
bigger = ws1 > ws2 ? ws1 : ws2;
smaller = ws1 < ws2 ? ws1 : ws2;
@@ -636,14 +662,17 @@
let H_X = [];//x杞存爣棰�
let HAvg = [];//骞冲潎鍊�
let HDifference = [];//宸��
+ let HSJZ = [];//瀹為檯鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
HAvg.push(optionAVG[0][option.cols[0][j].field]);
HDifference.push(optionS[0][option.cols[0][j].field]);
+ HSJZ.push(optionSJZ[0][option.cols[0][j].field]);
} else {
HAvg.push(0);
HDifference.push(0);
+ HSJZ.push(0);
}
}
@@ -655,7 +684,7 @@
title: {
text: '骞冲潎鍊�',
left: 'center'
- },
+ },
grid: {
x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
//y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
@@ -668,7 +697,7 @@
},
yAxis: {
type: 'value',
- min: parseFloat($("#HDownLimit").val()) != 0 ? calc((parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3), "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+ min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
},
@@ -676,21 +705,7 @@
{
data: HAvg,
type: 'line',
- areaStyle: {//濉厖鐨勯鑹�
- color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
- type: 'linear',
- x: 0,
- y: 1,
- x2: 0,
- y2: 0,
- colorStops: [{
- offset: 0, color: 'rgba(232,247,247)' // 0% 澶勭殑棰滆壊
- }, {
- offset: 1, color: 'rgba(183,252,252)' // 100% 澶勭殑棰滆壊
- }],
- globalCoord: false// 缂虹渷涓� false
- }
- },
+
itemStyle: { normal: { label: { show: true } } },
markLine: {
symbol: 'none',//鍘绘帀绠ご
@@ -709,7 +724,8 @@
{
yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
}
- ]
+ ],
+ precision: 3
},
}
]
@@ -737,33 +753,22 @@
data: H_X
},
yAxis: {
- type: 'value'
+ type: 'value',
+ min: 0, // 璁剧疆鏈�灏忓��
+ max: parseFloat($("#HControlUpperLimit_S").val()) != 0 ? calc(parseFloat($("#HControlUpperLimit_S").val()), 0.01, "+") : 0, // 璁剧疆鏈�澶у��
+ interval: calc(parseFloat($("#HControlUpperLimit_S").val()), 10, "/"), // 璁剧疆闂磋窛
},
series: [
{
data: HDifference,
type: 'line',
- areaStyle: {//濉厖鐨勯鑹�
- color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
- type: 'linear',
- x: 0,
- y: 1,
- x2: 0,
- y2: 0,
- colorStops: [{
- offset: 0, color: 'rgba(255,240,170,0)' // 0% 澶勭殑棰滆壊
- }, {
- offset: 1, color: 'rgba(255,240,170,1)' // 100% 澶勭殑棰滆壊
- }],
- globalCoord: false// 缂虹渷涓� false
- }
- },
+
itemStyle: { normal: { label: { show: true } } },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
{
- yAxis: parseFloat($("#HControlUpperLimit_S").val()) , lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HControlUpperLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
},
{
yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
@@ -772,14 +777,61 @@
{
yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
}
- ]
+ ],
+ precision: 3
},
}
]
};
option_ZXT_Diff && myChart.setOption(option_ZXT_Diff);
- //#endregion
+ //瀹為檯鍊�
+ var chartDom = document.getElementById('histogram_SJZ');
+ var myChart = echarts.init(chartDom);
+ var option_ZXT_SJZ;
+
+ option_ZXT_SJZ = {
+ title: {
+ text: '妫�娴嬪��',
+ left: 'center'
+ },
+ grid: {
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: H_X
+ },
+ yAxis: {
+ type: 'value',
+ min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+ max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
+ interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
+ },
+ series: [
+ {
+ data: HSJZ,
+ type: 'line',
+ itemStyle: { normal: { label: { show: true } } },
+ markLine: {
+ symbol: 'none',//鍘绘帀绠ご
+ data: [
+ { yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
+ {
+ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
+ }
+ ],
+ precision: 3
+ },
+ }
+ ]
+ };
+ option_ZXT_SJZ && myChart.setOption(option_ZXT_SJZ);
+
+ //#endregion
}
@@ -890,7 +942,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠岄」鐩垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?Type=SPC&ID=' + HQCCheckNum.toString(), 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -902,8 +954,8 @@
$("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
$("#HQCCheckItemNumber").val(checkStatus.data[0].浠ｇ爜);
- btnCheckProjectList();
-
+ btnCheckProjectList(1);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -911,8 +963,18 @@
}
//妫�楠屾柟妗�
- function btnCheckProjectList() {
- var sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ function btnCheckProjectList(Type) {
+ HQCCheckNum = [];
+ //Type 1 鏍规嵁閫変腑鐨勬楠岄」鐩幓鏌ヨ鏁版嵁
+ //Type 2 鏍规嵁閫変腑鐨勭墿鏂欏幓鏌ヨ鏁版嵁
+ var sWheres = "";
+ if (Type == 1) {
+ sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ }
+ if (Type == 2) {
+ sWheres = " and 鐗╂枡浠ｇ爜='" + $("#HMaterNumber").val() + "'";
+ }
+
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/QC_Management/MES_QC_CheckProjectListProjectDetaiList',
@@ -922,9 +984,17 @@
success: function (data1) {
if (data1.count == 1) {
layer.close(wait);
- $("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
- $("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
- $("#HTargetVal").val(data1.data[0].鐩爣鍊�);
+
+ if (Type == 1) {
+ $("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
+ $("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
+ $("#HTargetVal").val(data1.data[0].鐩爣鍊�);
+ }
+ if (Type == 2) {
+ for (var i = 0; i < data1.data.length; i++) {
+ HQCCheckNum.push(data1.data[i]["妫�楠岄」鐩甀D"]);
+ }
+ }
//$("#HControlUpperLimit").val(data1.data[0].鎺у埗涓婇檺);
//$("#HControlLowerLimit").val(data1.data[0].鎺у埗涓嬮檺);
} 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_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index bcef798..e4d973b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -38,15 +38,7 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
- <div class="layui-inline" style="display:none">
- <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>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -208,8 +200,7 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- Year(); //鍒濆鍖栧勾
- DeptName();//鍒濆鍖栬溅闂�
+ Year(); //鍒濆鍖栧勾
Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -321,7 +312,6 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
- var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProject = $("#HProject").val();//椤圭洰鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -329,8 +319,7 @@
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
sWhere = {
- HYear: HYear
- , HDeptName: HDeptName
+ HYear: HYear
, HProject: HProject
, HMaterNumber: HMaterNumber
, HMaterName: HMaterName
@@ -345,8 +334,7 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- $("#HYear").val(new Date().getFullYear());
- $("#HDeptName").val("0");
+ $("#HYear").val(new Date().getFullYear());
$("#HProject").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
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_ProcessPerformancePass.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_ProcessPerformancePass.html"
index 9fc4509..d4d9940 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_ProcessPerformancePass.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_ProcessPerformancePass.html"
@@ -38,15 +38,7 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
- <div class="layui-inline" style="display:none">
- <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>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -209,7 +201,6 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
- DeptName();//鍒濆鍖栬溅闂�
Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -319,7 +310,6 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
- var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProject = $("#HProject").val();//椤圭洰鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -328,7 +318,6 @@
sWhere = {
HYear: HYear
- , HDeptName: HDeptName
, HProject: HProject
, HMaterNumber: HMaterNumber
, HMaterName: HMaterName
@@ -344,7 +333,6 @@
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
- $("#HDeptName").val("0");
$("#HProject").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 3a3bd46..328d5cc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -65,6 +65,8 @@
<option value="1607222-00-B">1607222-00-B</option>
<option value="1943600-00-B">1943600-00-B</option>
<option value="1941600-00-B">1941600-00-B</option>
+ <option value="1941600-00-C">1941600-00-C</option>
+ <option value="1943600-00-C">1943600-00-C</option>
<option value="鍏朵粬" selected>鍏朵粬</option>
</select>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html"
new file mode 100644
index 0000000..0d8ff78
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html"
@@ -0,0 +1,294 @@
+锘�<!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/zgqCustom/zgqCustom.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>
+</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="HProcExchBillNo" id="HProcExchBillNo">
+ </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">
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" style="margin-top:0px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏉＄爜淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show ">
+ <!--缂哄皯鐨勬暟鎹�-->
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+ </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 () {
+ 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
+ , soulTable = layui.soulTable
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ var option1 = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "SingleItemTransitList";
+ var HModName1 = "SingleItemTransitList_SN";
+
+ var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+
+ //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+ table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var HProcExchBillNo = datas.娴佽浆鍗″彿;
+ var HProcName = datas.宸ュ簭;
+
+ SelectTechParam(HProcExchBillNo, HProcName);//宸ヨ壓鍙傛暟
+ });
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 700
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ get_FastQuery();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HProcExchBillNo").val("");
+ sWhere = "";
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鏌ヨ鏁版嵁
+ function SelectTechParam(HProcExchBillNo, TableName) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleItemTransit_SN_List',
+ type: "GET",
+ data: { "sWhere": HProcExchBillNo, "TableName": TableName },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = ["鐢熶骇鏁伴噺", "宸ヤ环", "閲戦", "浠诲姟鏁伴噺", "鏁伴噺", "鍑虹珯鏁伴噺", "鎶ュ簾鏁伴噺", "涓嶈壇鏁伴噺", "宸ユ椂", "娴佽浆鍗℃暟閲�", "浠诲姟鍗曟暟閲�"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ }
+ else if ($.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 {
+ 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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option1 = {
+ elem: '#mainTable1'
+ //, toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option1);
+
+ layer.close(wait);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val(); //宸ュ簭娴佽浆鍗″彿
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleItemTransitList',
+ type: "GET",
+ async: false,
+ data: { "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left', 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 {
+ 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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 700
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(ajaxLoad);
+ }
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index f29538d..096b017 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -1000,8 +1000,8 @@
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
//$("#HProcName").val(data1.data[0]["宸ュ簭"]);
//$("#HProcID").val(data1.data[0]["HProcID"]);
- $("#HSourceID").val(data1.data[0]["HSourceID"]);
- $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
+ //$("#HSourceID").val(data1.data[0]["HSourceID"]);
+ //$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
$("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
@@ -1146,6 +1146,10 @@
layer.msg("璇锋壂娴佽浆鍗★紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if ($("#HSourceID").val() == "0") {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {
layer.msg("涓嶈壇鍜屽悎鏍兼暟閲忎笉鑳藉悓鏃朵负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
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_ProcessExchangeBill_BatchSplit.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_ProcessExchangeBill_BatchSplit.html"
index b4a80f5..c139ab5 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_ProcessExchangeBill_BatchSplit.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_ProcessExchangeBill_BatchSplit.html"
@@ -45,7 +45,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>-->
+ <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_BatchPrint" disabled>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit" style="margin-left:50px !important;">閫�鍑�</button>
</div>
</div>
@@ -127,9 +127,8 @@
data[0].HProQty = 0;
data[0].HSheetQty = Number(data[0].HSheetQty) + Number(1);
- switch (obj.event) {
+ switch (obj.event) {
case 'btn-CopyLine':
- var copydata = JSON.stringify(data);
if (data.length <= 0) {
layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
@@ -137,6 +136,19 @@
layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
}
else {
+ //鑾峰彇鏂版祦杞崱鍗曞彿锛屽唴鐮�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ data[0].HInterID = d.data[0].HInterID;
+ data[0].HBillNo = d.data[0].HBillNo;
+ }
+ });
+ var copydata = JSON.stringify(data);
+
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
var HArrIndex = -1;
@@ -154,7 +166,7 @@
//option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
}
- break;
+ break;
}
});
//#endregion
@@ -186,10 +198,10 @@
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
+ , field = obj.field; //寰楀埌瀛楁
switch (field) {
- case "HProQty":
+ case "HProQty":
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HProQty: value
@@ -232,7 +244,7 @@
} else if (params[1] == null) {
Pub_Close(2);
}
- })
+ })
//#endregion
//#region 椤甸潰鏂规硶
@@ -257,10 +269,14 @@
, { field: 'HQty', title: '璁㈠崟鎬绘暟', width: 110 }
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
- , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110 }
+ , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
- , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170 }
+ , { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
+ , { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -270,6 +286,7 @@
"HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HMaterID": 0, "鐗╂枡浠ｇ爜": ""
, "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
, "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
+ , "HInterID": 0, "HBillNo": "", "HBatchNo": ""
}];
option.data = rowdata;
@@ -288,7 +305,22 @@
//缃戞牸鏁版嵁璧嬪��
var subdata = result.data
var rowdata = [];
+ var HInterID = 0;
+ var HBillNo = "";
for (var i = 0; i < subdata.length; i++) {
+
+ //鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ async: false,
+ success: function (d) {
+ HInterID = d.data[0].HInterID;
+ HBillNo = d.data[0].HBillNo;
+ }
+ });
+
rowdata.push(
{
"HICMOInterID": subdata[i].HICMOInterID, "HICMOEntryID": subdata[i].HICMOEntryID, "HICMOBillNo": subdata[i].HICMOBillNo
@@ -296,6 +328,7 @@
, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
, "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
+ , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": ""
}
)
}
@@ -319,10 +352,13 @@
, { field: 'HFinishQty', title: '宸茬敓鎴愭祦杞崱鏁�', width: 130 }
, { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
, { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
, { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
, { field: 'HRoutingName', title: '宸ヨ壓璺嚎', width: 170, edit: 'text', event: "HRoutingName" }
, { field: 'HSheetQty', title: '鎷嗗垎娴佽浆鍗″紶鏁�', width: 130 }
, { field: 'HDate', title: '娴佽浆鍗℃棩鏈�', width: 120, event: 'HDate' }
+ , { field: 'HInterID', title: '娴佽浆鍗″唴鐮�', width: 130, hide: true }
+ , { field: 'HBillNo', title: '娴佽浆鍗″彿', width: 170 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
, data: rowdata
@@ -370,6 +406,8 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+
var sSubTable = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
@@ -390,16 +428,18 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').removeClass("layui-btn-disabled").attr("disabled", false);//鎵撳嵃鎸夐挳鍚敤
layer.close(index);
}
else {
layer.alert(data.Message, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
},
error: function (err) {
layer.alert("閿欒:" + err, { icon: 5 });
+ $('#add-btn').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
layer.close(index);
}
});
@@ -439,7 +479,7 @@
layer.close(index);//鍏抽棴寮圭獥
}
})
- }
+ }
obj.event = "";
return false;
@@ -453,13 +493,10 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var rows = [];
- var arr = [];
- var ieid = [];
+ var HInterID_Arr = [];
+
for (var i = 0; i < data.length; i++) {
- rows.push(data[i].hmainid.toString());
- arr.push(data[i].hentryid.toString());
- ieid.push(data[i].hmainid.toString() + data[i].hentryid.toString())
+ HInterID_Arr.push(data[i].HInterID.toString());
}
layer.open({
@@ -469,7 +506,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID_Arr.toString() + "|" + 0 + '&MyMsg=' + HInterID_Arr.toString() + '&Type=HProcessExchange', 'yes']
, resize: false
})
}
@@ -529,7 +566,7 @@
}
}
}
-
+
return true;
}
//#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_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"
new file mode 100644
index 0000000..671e4a1
--- /dev/null
+++ "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"
@@ -0,0 +1,226 @@
+锘�<!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/zgqCustom/zgqCustom.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/lib/extend/echarts.min.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="HEquipFileNo" id="HEquipFileNo" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(100vh);margin-top:5px;"> </div>
+ </div>
+ </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
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var ColNameData = [];//鍒楀悕鏁版嵁
+ var DateData = [];//鏃ユ湡鏁版嵁
+ var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_FastQuery();
+ }
+
+ //鏌ヨ鏁版嵁
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/HeatTreatmentTemperatureCurveChart',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(wait);
+ for (var i = 1; i < data1.list.length; i++) {
+ ColNameData.push(data1.list[i]["ColmCols"]);
+ }
+ for (var i = 0; i < data1.data.length; i++) {
+ DateData.push(data1.data[i]["HDate"]);
+ }
+ option = data1;
+ set_Line();
+
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鎶樼嚎鍥�
+ function set_Line() {
+ //#region銆愭姌绾垮浘銆�
+ //骞冲潎鍊�
+ var chartDom = document.getElementById('HeatTreatmentTemperatureCurveChart');
+ var myChart = echarts.init(chartDom);
+ var option_Data;
+
+ var Data_series = [];
+
+ for (var i = 0; i < ColNameData.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData[i]]);
+ }
+ Data_series.push({
+ name: ColNameData[i],
+ type: 'line',
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: optionData
+ })
+ }
+
+ option_Data = {
+ title: {
+ text: '鐑鐞嗘俯搴︽洸绾垮浘',
+ top: '3%',
+ left: 'center'
+ },
+ legend: {
+ data: ColNameData
+ },
+ grid: {
+ top:"13%",
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ //bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: DateData,
+ axisLabel: {
+ //interval: 0 // 璁剧疆涓�0浠ユ樉绀烘墍鏈夊潗鏍囩偣
+ }
+ },
+ yAxis: {
+ type: 'value',
+ min: 0,
+ max:1000
+ },
+ series: Data_series
+ };
+ option_Data && myChart.setOption(option_Data);
+
+ //#endregion
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HEquipFileNo = $("#HEquipFileNo").val();
+
+ sWhere = HEquipFileNo;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HEquipFileNo").val("0");
+ form.render()
+ sWhere = "";
+ }
+
+ //#endregion
+ });
+</script>
\ No newline at end of file
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/Sc_HICMMaterStatisticsList.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/Sc_HICMMaterStatisticsList.html"
index b35ac8b..ca9035c 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/Sc_HICMMaterStatisticsList.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/Sc_HICMMaterStatisticsList.html"
@@ -263,6 +263,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -292,15 +293,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
- switch (data[i].Type) {
- //int
+ switch (data[i].Type) {
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 });
@@ -315,6 +321,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
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/Sc_HMaterYieldStatisticsList.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/Sc_HMaterYieldStatisticsList.html"
index 080c030..b265493 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/Sc_HMaterYieldStatisticsList.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/Sc_HMaterYieldStatisticsList.html"
@@ -265,6 +265,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -294,15 +295,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
- switch (data[i].Type) {
- //int
+ switch (data[i].Type) {
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 });
@@ -317,6 +323,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
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 a0f96aa..9b6f4e7 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"
@@ -709,7 +709,7 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;'}
- , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true,edit:'text' }
+ , { field: 'HQty', title: '鏁伴噺', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HPrice', title: '鍗曚环', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HMoney', title: '缁撶畻閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HReceiveBillInterID', title: '鎺ユ敹婧愬崟鍐呯爜', width: 100, hide: true, style: 'background-color:#efefef4d;' }
@@ -1237,8 +1237,13 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
});
+
}
else {
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1252,6 +1257,34 @@
}
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/YF_PayMentBill/AuditYF_PayMentBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+
//#region 缂栬緫椤甸潰鍒濆鍖�
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
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 3074712..0e2ac4c 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"
@@ -1274,7 +1274,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -1297,8 +1297,8 @@
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1322,7 +1322,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option);
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
@@ -1346,8 +1346,8 @@
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
@@ -1373,7 +1373,7 @@
obj.update({
HDiscountRate: oldText
});
-
+ table.render(option);
layer.msg("鎶樻墸鐜囪杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
return;
}
@@ -1393,8 +1393,8 @@
HQty = Number(HQty.toFixed(HQtyDec));
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
- HRelTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
@@ -1832,6 +1832,11 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index edd4913..5d55299 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -707,7 +707,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
@@ -750,7 +750,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
HTaxRate: HTaxRate * 100
@@ -790,7 +790,7 @@
HMoney = Number(HMoney.toFixed(HMoneyDec));
HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
- HTaxPrice = Number(HPrice.toFixed(HPriceDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
HQty: HQty //鏇存柊HQty瀛楁锛孒Qty
@@ -930,8 +930,8 @@
, { field: 'HMoney', title: '閲戦', event: 'inputHMoney', width: 90, totalRow: true }
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', event: 'inputHTaxPrice', width:90 }
, { field: 'HTaxRate', title: '绋庣巼%', edit: 'text', event: 'inputHTaxRate', width:90 }
- , { field: 'HTaxMoney', title: '绋庨', edit: 'text', event: 'inputHTaxMoney', width:90 }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', edit: 'text', event: 'inputHlineTotal', width:90 }
+ , { field: 'HTaxMoney', title: '绋庨', event: 'inputHTaxMoney', width:90 }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', event: 'inputHlineTotal', width:90 }
, { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', edit: 'text', event: 'inputHlineTotalBB', width:125 }
, { field: 'HDate', title: '棰勮浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>", event: 'HDate' }
, { field: 'HBagType', title: '鍖呰鏂瑰紡', edit: 'text', width: 120 }
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/Add_Edit_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/Add_Edit_Cg_POInStockBillList.html"
index 2906ada..bb6c565 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/Add_Edit_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/Add_Edit_Cg_POInStockBillList.html"
@@ -162,7 +162,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">閫夊崟鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -647,7 +647,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option)
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -676,7 +676,7 @@
});
table.render(option)
break;
- case "HTaxRate": //鏁伴噺
+ case "HTaxRate": //绋庣巼
//鏁版嵁鏍煎紡鏍￠獙
temp = value + "";
if (!ref.test(temp)) {
@@ -684,7 +684,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option)
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
@@ -724,7 +724,7 @@
obj.update({
HDiscountRate: oldText
});
-
+ table.render(option)
layer.msg("鎶樻墸鐜囪杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
return;
}
@@ -757,7 +757,7 @@
});
table.render(option);
break;
- case "HTaxPrice": //鍗曚环
+ case "HTaxPrice": //鍚◣鍗曚环
//鏁版嵁鏍煎紡鏍￠獙
temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
// ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
@@ -795,10 +795,122 @@
});
table.render(option)
break;
+ case "HMoney": //閲戦
+ //鏁版嵁鏍煎紡鏍￠獙
+ temp = value + ""; //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰 鍙橀噺temp
+ // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+ if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+ //鎭㈠鏁版嵁鍒扮紪杈戝墠
+ obj.update({ //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+ HMoney: oldText //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+ });
+ table.render(option);
+ layer.msg("閲戦璇疯緭鍏ユ暟瀛�!"); //璇疯緭鍏ュ崟浠风殑鏁板��
+ return;
+ }
+
+ //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+ var HQty = obj.data.HQty * 1; //鏁伴噺
+ var HMoney = value * 1; //閲戦
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
+ var HPrice = Number((HMoney / HQty)); //鍗曚环 = 閲戦/(鏁伴噺)
+ var HTaxPrice = Number(HPrice * (1 + HTaxRate)); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+
+
+ var HTaxMoney = Number((HMoney * HTaxRate)); //绋庨=閲戦*绋庣巼
+ var HDiscountRate = obj.data.HDiscountRate * 1; //鎶樻墸鐜�
+ //鏁板瓧绮惧害
+ HQty = Number(HQty.toFixed(HQtyDec));
+ HPrice = Number(HPrice.toFixed(HPriceDec));
+ HMoney = Number(HMoney.toFixed(HMoneyDec));
+ HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+ HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({ //鏇存柊琛ㄦ牸鏁版嵁 鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+ HQty: Number(HQty.toFixed(HQtyDec))
+ , HPrice: Number(HPrice.toFixed(HPriceDec))
+ , HMoney: Number(HMoney.toFixed(HMoneyDec))
+ , HTaxMoney: HTaxMoney //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+ , HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec)) //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+ });
+ table.render(option)
+ break;
default:
}
});
//#endregion
+
+ //#region 鍥炶溅閫夋嫨婧愬崟
+ $('#HSourceBillNo').on('keydown', function (event) {
+ var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+ if (event.keyCode == 13) {
+ var ajaxLoad = layer.load();
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HSourceBillNo == "") {
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/list',
+ type: "GET",
+ data: { "sWhere": "and 鍗曟嵁鍙� = '" + HSourceBillNo+"'", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var checkStatus = result;
+ if (checkStatus.data[0].鐘舵�� != "宸插鏍�") {
+ layer.close(ajaxLoad);
+ layer.msg("婧愬崟鐘舵�佹湭瀹℃牳", { icon: 5 });
+ return;
+ }
+ if ($("#HSourceBillType").val() == "1102") {
+ $("#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].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HAddress").val(checkStatus.data[0].浜よ揣鍦扮偣);
+ $("HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿)
+
+ var j = 0;
+ for (var i = 0; i < result.data.length; i++) {
+ 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
+ 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].璁￠噺鍗曚綅,
+ "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环,
+ "HMoney": HNewMoney, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": HNewTaxMoney, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+ "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О, "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HSecUnitID": checkStatus.data[j].HSecUnitID, "杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+ "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+ })
+ j++;
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000,icon: 1 });
+ }
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert(result.msg+"鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ });
+ //#endregion
+
//#endregion
//#endregion
@@ -1186,6 +1298,11 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0);
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');//鎵撳嵃鏍煎紡
//淇濆瓨鍚庢祻瑙�
@@ -2182,7 +2299,9 @@
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
+ obj.del();//婧愮爜鍒犻櫎琛屾槸璧嬪��={}
+
+ table.cache["mainTable"].splice(rowIndex, 1); //浠庣紦瀛橀噷鍒犻櫎琛屾暟鎹�
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.reload(option);
layer.close(index);
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
index 5eadd91..e4af931 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBackBillList.html"
@@ -612,7 +612,7 @@
, { field: '杈呭姪鍗曚綅', title: '杈呭姪鍗曚綅', width: 100, edit: 'text', event: "HSecUnitID" }//f7
, { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true}
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
- , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;'}
, { field: 'HBatchNo', title: '鎵瑰彿', width: 150, edit: 'text' }
@@ -804,7 +804,7 @@
obj.update({
HPrice: oldText
});
-
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
}
@@ -837,7 +837,7 @@
obj.update({
HTaxRate: oldText
});
-
+ table.render(option);
layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
return;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
index b2c13fd..3de1a32 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\345\220\210\345\220\214/Add_Edit_Cg_ContractBillList.html"
@@ -809,7 +809,7 @@
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
+ , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, style: 'background-color:#efefef4d;' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index bf8bc15..1cd7a9d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -1182,7 +1182,11 @@
success: function (data) {// 褰撹姹傛垚鍔熸椂鎵ц鐨勫洖璋冨嚱鏁�
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 // 妫�鏌ヨ繑鍥炵殑鏁版嵁涓璫ount灞炴�х殑鍊兼槸鍚︿负1锛岃繖鍙兘琛ㄧず鎿嶄綔鎴愬姛
layer.msg(data.Message, { icon: 1 }); //浣跨敤layer鎻掍欢鏄剧ず涓�涓秷鎭紝鍥炬爣涓�1锛堥�氬父琛ㄧず鎴愬姛锛�
-
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(); //瀹℃牳
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤娣诲姞鎸夐挳锛岄槻姝㈤噸澶嶆彁浜�
$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
//淇濆瓨鍚庢祻瑙�
@@ -1199,6 +1203,33 @@
}
});
}
+ //#endregion
+
+ //#region 瀹℃牳鏁版嵁
+ function set_CheckBill() {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_POOrderBill/AuditCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//#region 搴撳瓨鏌ヨ
@@ -1419,6 +1450,7 @@
//浠撳簱
if (obj.event == "HWHID") { //鍒ゆ柇obj.event浜嬩欢 鐨勫瓧绗︿覆鏄惁==HWHID
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({ //鎵撳紑灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe 绫诲瀷涓�2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1427,7 +1459,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, btn: ["纭畾", "鍙栨秷"] //鑷畾涔夐�夋嫨鎸夐挳 鍏舵寜閽殑鍚嶇О涓� 纭畾锛屽彇娑�
, btn1: function (index, laero) { //褰撲负涓虹‘璁ゆ椂
//鎸夐挳涓� 鐨勫洖璋�
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 2466f54..c900b79 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"
@@ -236,7 +236,7 @@
var sWhere = "";
var option = [];
var optionSub = [];
- var Name = "MouldProdInHouseCellWidth";
+ var Name = "Cg_POOrderBillWidth";
var HModName = "Cg_POOrderBillQuery";
var HModNameSub = "Cg_POOrderBillQuerySub";
var HBillType = "1102";
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 6cbfcb3..243d20d 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"
@@ -1041,6 +1041,11 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(); //瀹℃牳
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
@@ -1058,6 +1063,33 @@
}
//#endregion
+ //#region 瀹℃牳鏁版嵁
+ function set_CheckBill() {
+ var InterID = $("#HInterID").val();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": 1, "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);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
function get_DeptHManage() {
//椤甸潰鍒濆鍖栧姞杞� 涓氬姟鍛� 涓荤 閮ㄩ棬
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 6c11492..6ba396b 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"
@@ -1828,6 +1828,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
index 58ccf57..e9c1f25 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\346\224\266\346\254\276\345\215\225/YS_ReceiveBill.html"
@@ -1315,7 +1315,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
- layer.msg("鎻愪氦鎴愬姛");
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
});
}
else {
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/Add_Edit_Xs_SeOrderBillList.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/Add_Edit_Xs_SeOrderBillList.html"
index 62c9806..e5f2fc7 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/Add_Edit_Xs_SeOrderBillList.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/Add_Edit_Xs_SeOrderBillList.html"
@@ -1863,6 +1863,11 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
}
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_SeOrderBillList.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_SeOrderBillList.html"
index 6104de2..98a42c1 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_SeOrderBillList.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_SeOrderBillList.html"
@@ -834,9 +834,6 @@
ins = table.render(option);
layer.close(ajaxLoad);
DisPlay_HideColumn();
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
index 194bb81..0c140f5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -198,7 +198,8 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
- //鎵弿鏉″舰鐮佹柟娉�
+
+ //鎵弿鏉″舰鐮佹柟娉昻ew
function GetMeesageByBarCode() {
var HBarCode = $('#HBarCode').val();
if (!HBarCode) {
@@ -211,40 +212,82 @@
return;
}
var index = layer.load();
- var sSubStr = table.cache['mainTable'];
- if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- table.render(option);
- return;
- }
- layer.close(index);
- //$.ajax({
- // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
- // type: "GET",
- // data: { "HBarCode": HBarCode, "HInterID": HInterID },
- // success: function (result) {
- // if (result.code == "1") {
- // var sSubStr = table.cache['mainTable'];
- // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
- // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
- // table.render(option);
- // break;
- // }
- // 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: "娓╅Θ鎻愮ず" });
- // }
- //});
+ $.ajax({
+ url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ success: function (result) {
+ if (result.code == "1") {
+ var sSubStr = table.cache['mainTable'];
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == result.data[0].HMaterID) {
+ sSubStr[i].HSQty += result.data[0].HQty;
+ table.render(option);
+ break;
+ }
+ }
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
$('#HBarCode').val("");
$("#HBarCode").focus();
}
+ ////鎵弿鏉″舰鐮佹柟娉�
+ //function GetMeesageByBarCode() {
+ // var HBarCode = $('#HBarCode').val();
+ // if (!HBarCode) {
+ // layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ // return;
+ // }
+ // var HInterID = $('#HInterID').val();
+ // if (!HInterID) {
+ // layer.msg("璇峰厛杈撳叆鏀舵枡閫氱煡鍗曞崟鎹彿锛�")
+ // return;
+ // }
+ // var index = layer.load();
+ // var sSubStr = table.cache['mainTable'];
+ // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // table.render(option);
+ // return;
+ // }
+ // layer.close(index);
+ // //$.ajax({
+ // // url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
+ // // type: "GET",
+ // // data: { "HBarCode": HBarCode, "HInterID": HInterID },
+ // // success: function (result) {
+ // // if (result.code == "1") {
+ // // var sSubStr = table.cache['mainTable'];
+ // // if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
+ // // sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
+ // // table.render(option);
+ // // break;
+ // // }
+ // // 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: "娓╅Θ鎻愮ず" });
+ // // }
+ // //});
+ // $('#HBarCode').val("");
+ // $("#HBarCode").focus();
+ //}
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
@@ -253,6 +296,7 @@
//瀹℃牳
form.on('submit(btn_Check)', function (data) {//瀹℃牳
var sSubStr = table.cache['mainTable'];
+ var HReturn = "";
for (var i = 0; i < sSubStr.length; i++) {
if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓嶈兘瓒呭嚭璁㈠崟鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -262,11 +306,35 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵爜鏁伴噺涓�0", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if (parseInt(sSubStr[i].HSQty) != parseInt(sSubStr[i].HQty)) {
+ HReturn += "绗�" + (i + 1) + "琛�,璁㈠崟鏁伴噺涓庢潯鐮佹暟閲忎笉涓�鑷达紝鏄惁缁х画瀹℃牳<br/>";
+ }
}
+ if (HReturn != "") {
+ layer.confirm(HReturn, {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷'] //鍙互鏃犻檺涓寜閽�
+ }, function (index, layero) {
+ //鎸夐挳涓�鍥炶皟
+ set_Aduit();
+ }, function (index) {
+ //鎸夐挳浜屽洖璋�
+ return;
+ });
+ } else {
+ set_Aduit();
+ }
+
+ });
+
+ //瀹℃牳鎸夐挳鏂规硶
+ function set_Aduit() {
var index = layer.load();
var HInterID = $('#HInterID').val();
var HBillNo = $('#HBillNo').val();
+ var sSubStr = table.cache['mainTable'];
$.ajax({
url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost",
type: "Post",
@@ -291,7 +359,7 @@
layer.close(index);
}
});
- });
+ }
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
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 1c81d05..42b6773 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"
@@ -2102,6 +2102,11 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
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 4dc9552..420f234 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"
@@ -723,7 +723,7 @@
obj.update({
HPrice: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -765,7 +765,7 @@
obj.update({
HMoney: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -775,7 +775,7 @@
var HQty = obj.data.HQty * 1; //鏁伴噺
var HMoney = value * 1;
var HPrice = (HMoney / HQty); //鍗曚环=閲戦/鏁伴噺
- var HTaxRate = value * 0.01; //绋庣巼
+ var HTaxRate = obj.data.HTaxRate * 0.01; //绋庣巼
var HTaxPrice = HPrice * (1 + HTaxRate); //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
var HTaxMoney = HMoney * HTaxRate; //绋庨=閲戦*绋庣巼
var HlineTotal = HMoney + HTaxMoney; //浠风◣鍚堣=閲戦+绋庨
@@ -1471,7 +1471,11 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
-
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(0); //瀹℃牳
+ }
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
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_POStockInBackBill_Add_Up.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_POStockInBackBill_Add_Up.html"
index 20b7bb7..dd41307 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_POStockInBackBill_Add_Up.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_POStockInBackBill_Add_Up.html"
@@ -679,7 +679,7 @@
obj.update({
HMoney: oldText
});
- /* table.render(option);*/
+ table.render(option);
layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
return;
@@ -688,7 +688,7 @@
//鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
var HQty = obj.data.HQty * 1; //鏁伴噺
var HMoney = value * 1;
- var HPrice = (HMoney / HQty).toFixed(2); //鍗曚环=閲戦/鏁伴噺
+ var HPrice = Number((HMoney / HQty).toFixed(2)); //鍗曚环=閲戦/鏁伴噺
HQty = Number(HQty.toFixed(HQtyDec));
HPrice = Number(HPrice.toFixed(HPriceDec));
HMoney = Number(HMoney.toFixed(HMoneyDec));
--
Gitblit v1.9.1